lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

It's not safe to store a file-scope pointer to a mobj_t* without having any mechanism to clear it between map reloadings, so move the Tailsbot "press jump now to fly!" indicator into tails->target.

Browse source 
Resolves #331, and likely also #330 and #309.
This commit is contained in:
toaster 2019-11-23 14:43:36 +00:00
parent 4ccb4f5c8a
commit 5a63e22f56
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/b_bot.c
View file

@ -31,7 +31,6 @@ static boolean panic = false;
static UINT8 flymode = 0; static UINT8 flymode = 0;
static boolean spinmode = false; static boolean spinmode = false;
static boolean thinkfly = false; static boolean thinkfly = false;
static mobj_t *overlay;
static inline void B_ResetAI(void) static inline void B_ResetAI(void)
{ {
@ -336,17 +335,20 @@ static inline void B_BuildTailsTiccmd(mobj_t *sonic, mobj_t *tails, ticcmd_t *cm
// Thinkfly overlay // Thinkfly overlay
if (thinkfly) if (thinkfly)
{ {
if (overlay == NULL) if (!tails->target)
{ {
overlay = P_SpawnMobjFromMobj(tails, 0, 0, 0, MT_OVERLAY); P_SetTarget(&tails->target, P_SpawnMobjFromMobj(tails, 0, 0, 0, MT_OVERLAY));
P_SetTarget(&overlay->target, tails); if (tails->target)
P_SetMobjState(overlay, S_FLIGHTINDICATOR); {
P_SetTarget(&tails->target->target, tails);
P_SetMobjState(tails->target, S_FLIGHTINDICATOR);
}
} }
} }
else if (overlay != NULL) else if (tails->target && tails->target->type == MT_OVERLAY && tails->target->state == states+S_FLIGHTINDICATOR)
{ {
P_RemoveMobj(overlay); P_RemoveMobj(tails->target);
overlay = NULL; P_SetTarget(&tails->target, NULL);
} }
// Turn the virtual keypresses into ticcmd_t. // Turn the virtual keypresses into ticcmd_t.