thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 20:41:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allow S_NULL to be used on followers

Browse source
This commit is contained in:
Latapostrophe 2020-05-04 15:22:14 +02:00
parent 59452ae026
commit ee94e064e9
1 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/p_user.c
View file

@ -8047,6 +8047,17 @@ void P_DoTimeOver(player_t *player)
*/ */
static void P_SetFollowerState(mobj_t *f, INT32 state) static void P_SetFollowerState(mobj_t *f, INT32 state)
{ {
if (!f || P_MobjWasRemoved(f))
return; // safety net
// No, do NOT set the follower to S_NULL. Set it to S_INVISIBLE.
if (state == S_NULL)
{
state = S_INVISIBLE;
f->threshold = 1; // Threshold = 1 means stop doing anything related to setting states, so that we don't get out of S_INVISIBLE
}
// extravalue2 stores the last "first state" we used. // extravalue2 stores the last "first state" we used.
// because states default to idlestates, if we use an animation that uses an "ongoing" state line, don't reset it! // because states default to idlestates, if we use an animation that uses an "ongoing" state line, don't reset it!
// this prevents it from looking very dumb // this prevents it from looking very dumb
@ -8129,6 +8140,15 @@ static void P_HandleFollower(player_t *player)
} }
else // follower exists, woo! else // follower exists, woo!
{ {
// Safety net (2)
if (P_MobjWasRemoved(player->follower))
{
player->follower = NULL; // Remove this and respawn one, don't crash the game if Lua decides to P_RemoveMobj this thing.
return;
}
// first of all, handle states following the same model as above: // first of all, handle states following the same model as above:
if (player->follower->tics == 1) if (player->follower->tics == 1)
P_SetFollowerState(player->follower, player->follower->state->nextstate); P_SetFollowerState(player->follower, player->follower->state->nextstate);
@ -8157,6 +8177,12 @@ static void P_HandleFollower(player_t *player)
// if we're moving let's make the angle the direction we're moving towards. This is to avoid drifting / reverse looking awkward. // if we're moving let's make the angle the direction we're moving towards. This is to avoid drifting / reverse looking awkward.
// Make sure the follower itself is also moving however, otherwise we'll be facing angle 0 // Make sure the follower itself is also moving however, otherwise we'll be facing angle 0
if (player->follower->threshold)
return; // Threshold means the follower was "despanwed" with S_NULL.
// However with how the code is factored, this is just a special case of S_INVISBLE to avoid having to add other player variables.
// handle follower animations. Could probably be better... // handle follower animations. Could probably be better...
// hurt or dead // hurt or dead
if (player->kartstuff[k_spinouttimer] || player->mo->state == &states[S_KART_SPIN] || player->mo->health <= 0) if (player->kartstuff[k_spinouttimer] || player->mo->state == &states[S_KART_SPIN] || player->mo->health <= 0)