stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-30 13:10:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Messed up the force shield stuff when implementing SH_MUSHROOM.

Browse source
This commit is contained in:
toasterbabe 2016-10-13 15:13:33 +01:00
parent 91f9770caf
commit 2d85b146ea
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/p_enemy.c
View file

@ -3368,12 +3368,6 @@ void A_ForceShield(mobj_t *actor)
if (!(player->powers[pw_shield] & SH_FORCE)) if (!(player->powers[pw_shield] & SH_FORCE))
{ {
if (mariomode)
{
player->mo->movecount = player->powers[pw_shield];
player->powers[pw_marioflashing] = MARIOFLASHINGTICS;
}
// Just in case. // Just in case.
if (player->pflags & PF_SHIELDABILITY) if (player->pflags & PF_SHIELDABILITY)
{ {
@ -3388,16 +3382,22 @@ void A_ForceShield(mobj_t *actor)
G_GhostAddColor(GHC_NORMAL); G_GhostAddColor(GHC_NORMAL);
} }
player->powers[pw_shield] = SH_FORCE|(player->powers[pw_shield] & SH_STACK)|0x01;
P_SpawnShieldOrb(player);
S_StartSound(player->mo, actor->info->seesound); S_StartSound(player->mo, actor->info->seesound);
} }
else else if (mariomode)
S_StartSound(player->mo, sfx_itemup);
if ((player->powers[pw_shield] & SH_FORCE) && (player->powers[pw_shield] & SH_FORCEHP))
return; // if you have a force shield with at least 2hp already, let's not go any further.
if (mariomode)
{ {
player->powers[pw_shield] = SH_FORCE|(player->powers[pw_shield] & SH_STACK)|0x01; player->mo->movecount = player->powers[pw_shield];
if (mariomode) player->powers[pw_marioflashing] = MARIOFLASHINGTICS;
S_StartSound(player->mo, sfx_itemup);
} }
player->powers[pw_shield] = SH_FORCE|(mariomode ? SH_MUSHROOM : player->powers[pw_shield] & SH_STACK)|0x01;
P_SpawnShieldOrb(player);
} }
// Function: A_PityShield // Function: A_PityShield