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

Accidentally put this check in the wrong place

Browse source
This commit is contained in:
Latapostrophe 2020-05-04 21:19:28 +02:00
parent c687f3088e
commit a8e642b394
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/r_things.c
View file

@ -3045,20 +3045,21 @@ void SetFollower(INT32 playernum, INT32 skinnum)
player_t *player = &players[playernum]; player_t *player = &players[playernum];
player->followerready = true; // we are ready to perform follower related actions in the player thinker, now. player->followerready = true; // we are ready to perform follower related actions in the player thinker, now.
if (skinnum >= -1 && skinnum <= numfollowers && player->followerskin != skinnum) // Make sure it exists! if (skinnum >= -1 && skinnum <= numfollowers) // Make sure it exists!
{ {
player->followerskin = skinnum;
//CONS_Printf("Updated player follower num\n");
/* /*
We don't spawn the follower here since it'll be easier to handle all of it in the Player thinker itself. We don't spawn the follower here since it'll be easier to handle all of it in the Player thinker itself.
However, we will despawn it right here if there's any to make it easy for the player thinker to replace it or delete it. However, we will despawn it right here if there's any to make it easy for the player thinker to replace it or delete it.
*/ */
if (player->follower) if (player->follower && skinnum != player->followerskin) // this is also called when we change colour so don't respawn the follower unless we changed skins
{ {
P_RemoveMobj(player->follower); P_RemoveMobj(player->follower);
player->follower = NULL; player->follower = NULL;
} }
player->followerskin = skinnum;
//CONS_Printf("Updated player follower num\n");
// for replays: We have changed our follower mid-game; let the game know so it can do the same in the replay! // for replays: We have changed our follower mid-game; let the game know so it can do the same in the replay!
demo_extradata[playernum] |= DXD_FOLLOWER; demo_extradata[playernum] |= DXD_FOLLOWER;