stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-16 01:31:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

toaster guidance

Browse source
This commit is contained in:
Tatsuru 2020-01-11 21:35:19 -03:00
parent 5d33ca42cf
commit 4221f08a7c
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/p_user.c
View file

@ -12271,17 +12271,6 @@ void P_PlayerThink(player_t *player)
else else
player->powers[pw_nocontrol] = 0; player->powers[pw_nocontrol] = 0;
if (player->powers[pw_dye])
{
player->mo->colorized = true;
player->mo->color = player->powers[pw_dye];
}
else
{
player->mo->colorized = false;
player->mo->color = player->skincolor;
}
//pw_super acts as a timer now //pw_super acts as a timer now
if (player->powers[pw_super] if (player->powers[pw_super]
&& (player->mo->state < &states[S_PLAY_SUPER_TRANS1] && (player->mo->state < &states[S_PLAY_SUPER_TRANS1]
@ -12928,6 +12917,17 @@ void P_PlayerAfterThink(player_t *player)
player->mo->flags |= MF_NOGRAVITY; player->mo->flags |= MF_NOGRAVITY;
} }
if (player->powers[pw_dye])
{
player->mo->colorized = true;
player->mo->color = player->powers[pw_dye];
}
else
{
player->mo->colorized = false;
player->mo->color = player->skincolor;
}
if (player->followmobj && (player->spectator || player->mo->health <= 0 || player->followmobj->type != player->followitem)) if (player->followmobj && (player->spectator || player->mo->health <= 0 || player->followmobj->type != player->followitem))
{ {
P_RemoveMobj(player->followmobj); P_RemoveMobj(player->followmobj);