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

Cleanup of P_CheckUnderwaterAndSpaceTimer's conditional checks for future PF_ROBOT changes, where characters like Metal make electric zaps instead of bubbles.

Browse source
This commit is contained in:
toasterbabe 2016-07-16 17:11:34 +01:00
parent 226785dcd6
commit 94490623b5
1 changed files with 37 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

96
src/p_user.c
View file

@ -2007,66 +2007,44 @@ static void P_CheckSneakerAndLivesTimer(player_t *player)
// //
static void P_CheckUnderwaterAndSpaceTimer(player_t *player) static void P_CheckUnderwaterAndSpaceTimer(player_t *player)
{ {
fixed_t height; tic_t timeleft = (player->powers[pw_spacetime]) ? player->powers[pw_spacetime] : player->powers[pw_underwater];
mobj_t *numbermobj = NULL;
if (player->mo->eflags & MFE_VERTICALFLIP) if ((timeleft == 11*TICRATE + 1) // 5
height = player->mo->z - FixedMul(8*FRACUNIT - mobjinfo[MT_DROWNNUMBERS].height, player->mo->scale); || (timeleft == 9*TICRATE + 1) // 4
else || (timeleft == 7*TICRATE + 1) // 3
height = player->mo->z + player->mo->height + FixedMul(8*FRACUNIT, player->mo->scale); || (timeleft == 5*TICRATE + 1) // 2
|| (timeleft == 3*TICRATE + 1) // 1
|| (timeleft == 1*TICRATE + 1) // 0
) {
fixed_t height = (player->mo->eflags & MFE_VERTICALFLIP)
? player->mo->z - FixedMul(8*FRACUNIT - mobjinfo[MT_DROWNNUMBERS].height, player->mo->scale)
: player->mo->z + player->mo->height + FixedMul(8*FRACUNIT, player->mo->scale);
if (player->powers[pw_underwater] == 11*TICRATE + 1 || player->powers[pw_spacetime] == 11*TICRATE + 1) mobj_t *numbermobj = P_SpawnMobj(player->mo->x, player->mo->y, height, MT_DROWNNUMBERS);
{
numbermobj = P_SpawnMobj(player->mo->x, player->mo->y, height, MT_DROWNNUMBERS); timeleft /= (2*TICRATE); // To be strictly accurate it'd need to be ((timeleft/TICRATE) - 1)/2, but integer division rounds down for us
P_SetMobjState(numbermobj, numbermobj->info->spawnstate+5);
} S_StartSound(player->mo, sfx_dwnind);
else if (player->powers[pw_underwater] == 9*TICRATE + 1 || player->powers[pw_spacetime] == 9*TICRATE + 1)
{ if (timeleft) // Don't waste time setting the state if the time is 0.
numbermobj = P_SpawnMobj(player->mo->x, player->mo->y, height, MT_DROWNNUMBERS); P_SetMobjState(numbermobj, numbermobj->info->spawnstate+timeleft);
P_SetMobjState(numbermobj, numbermobj->info->spawnstate+4);
}
else if (player->powers[pw_underwater] == 7*TICRATE + 1 || player->powers[pw_spacetime] == 7*TICRATE + 1)
{
numbermobj = P_SpawnMobj(player->mo->x, player->mo->y, height, MT_DROWNNUMBERS);
P_SetMobjState(numbermobj, numbermobj->info->spawnstate+3);
}
else if (player->powers[pw_underwater] == 5*TICRATE + 1 || player->powers[pw_spacetime] == 5*TICRATE + 1)
{
numbermobj = P_SpawnMobj(player->mo->x, player->mo->y, height, MT_DROWNNUMBERS);
P_SetMobjState(numbermobj, numbermobj->info->spawnstate+2);
}
else if (player->powers[pw_underwater] == 3*TICRATE + 1 || player->powers[pw_spacetime] == 3*TICRATE + 1)
{
numbermobj = P_SpawnMobj(player->mo->x, player->mo->y, height, MT_DROWNNUMBERS);
P_SetMobjState(numbermobj, numbermobj->info->spawnstate+1);
}
else if (player->powers[pw_underwater] == 1*TICRATE + 1 || player->powers[pw_spacetime] == 1*TICRATE + 1)
{
numbermobj = P_SpawnMobj(player->mo->x, player->mo->y, height, MT_DROWNNUMBERS);
//P_SetMobjState(numbermobj, numbermobj->info->spawnstate+0);
}
// Underwater timer runs out
else if (player->powers[pw_underwater] == 1)
{
if ((netgame || multiplayer) && P_IsLocalPlayer(player))
S_ChangeMusic(mapmusname, mapmusflags, true);
P_DamageMobj(player->mo, NULL, NULL, 1, DMG_DROWNED);
}
else if (player->powers[pw_spacetime] == 1)
{
if ((netgame || multiplayer) && P_IsLocalPlayer(player))
S_ChangeMusic(mapmusname, mapmusflags, true);
P_DamageMobj(player->mo, NULL, NULL, 1, DMG_SPACEDROWN);
}
if (numbermobj)
{
P_SetTarget(&numbermobj->target, player->mo); P_SetTarget(&numbermobj->target, player->mo);
numbermobj->threshold = 40; numbermobj->threshold = 40;
S_StartSound(player->mo, sfx_dwnind);
numbermobj->destscale = player->mo->scale; numbermobj->destscale = player->mo->scale;
P_SetScale(numbermobj, player->mo->scale); P_SetScale(numbermobj, player->mo->scale);
} }
// Underwater timer runs out
else if (timeleft == 1)
{
if ((netgame || multiplayer) && P_IsLocalPlayer(player))
S_ChangeMusic(mapmusname, mapmusflags, true);
if (player->powers[pw_spacetime] == 1)
P_DamageMobj(player->mo, NULL, NULL, 1, DMG_SPACEDROWN);
else
P_DamageMobj(player->mo, NULL, NULL, 1, DMG_DROWNED);
}
if (!(player->mo->eflags & MFE_UNDERWATER) && player->powers[pw_underwater]) if (!(player->mo->eflags & MFE_UNDERWATER) && player->powers[pw_underwater])
{ {
@ -2085,19 +2063,19 @@ static void P_CheckUnderwaterAndSpaceTimer(player_t *player)
// Underwater audio cues // Underwater audio cues
if (P_IsLocalPlayer(player) && !player->bot) if (P_IsLocalPlayer(player) && !player->bot)
{ {
if (player->powers[pw_underwater] == 11*TICRATE + 1
&& player == &players[consoleplayer])
{
S_StopMusic();
S_ChangeMusicInternal("drown", false);
}
if (player->powers[pw_underwater] == 25*TICRATE + 1) if (player->powers[pw_underwater] == 25*TICRATE + 1)
S_StartSound(NULL, sfx_wtrdng); S_StartSound(NULL, sfx_wtrdng);
else if (player->powers[pw_underwater] == 20*TICRATE + 1) else if (player->powers[pw_underwater] == 20*TICRATE + 1)
S_StartSound(NULL, sfx_wtrdng); S_StartSound(NULL, sfx_wtrdng);
else if (player->powers[pw_underwater] == 15*TICRATE + 1) else if (player->powers[pw_underwater] == 15*TICRATE + 1)
S_StartSound(NULL, sfx_wtrdng); S_StartSound(NULL, sfx_wtrdng);
if (player->powers[pw_underwater] == 11*TICRATE + 1
&& player == &players[consoleplayer])
{
S_StopMusic();
S_ChangeMusicInternal("drown", false);
}
} }
if (player->exiting) if (player->exiting)