mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2025-01-29 20:50:58 +00:00
Logistical problems
This commit is contained in:
parent
7b3cc02ddc
commit
0fa638eaf5
2 changed files with 4 additions and 10 deletions
|
@ -8971,6 +8971,9 @@ void A_Dye(mobj_t *actor)
|
||||||
if (color >= MAXTRANSLATIONS)
|
if (color >= MAXTRANSLATIONS)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
if (!color)
|
||||||
|
target->colorized = false;
|
||||||
|
|
||||||
// What if it's a player?
|
// What if it's a player?
|
||||||
if (target->player)
|
if (target->player)
|
||||||
{
|
{
|
||||||
|
@ -8979,11 +8982,7 @@ void A_Dye(mobj_t *actor)
|
||||||
}
|
}
|
||||||
|
|
||||||
target->color = color;
|
target->color = color;
|
||||||
|
target->colorized = true;
|
||||||
if (!color)
|
|
||||||
target->colorized = false;
|
|
||||||
else
|
|
||||||
target->colorized = true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Function: A_MoveRelative
|
// Function: A_MoveRelative
|
||||||
|
|
|
@ -12922,11 +12922,6 @@ void P_PlayerAfterThink(player_t *player)
|
||||||
player->mo->colorized = true;
|
player->mo->colorized = true;
|
||||||
player->mo->color = player->powers[pw_dye];
|
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))
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue