mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2025-01-18 15:32:33 +00:00
* Remove sounds from swimming.
* Lower default swim animation speed. * Make speed of flight/swim animation increase whenever mashing jump.
This commit is contained in:
parent
c2f7b14336
commit
cf14d5fe5d
2 changed files with 12 additions and 3 deletions
|
@ -739,7 +739,7 @@ state_t states[NUMSTATES] =
|
|||
|
||||
// CA_FLY/CA_SWIM
|
||||
{SPR_PLAY, SPR2_FLY , 2, {NULL}, 0, 0, S_PLAY_FLY}, // S_PLAY_FLY
|
||||
{SPR_PLAY, SPR2_SWIM, 2, {NULL}, 0, 0, S_PLAY_SWIM}, // S_PLAY_SWIM
|
||||
{SPR_PLAY, SPR2_SWIM, 4, {NULL}, 0, 0, S_PLAY_SWIM}, // S_PLAY_SWIM
|
||||
{SPR_PLAY, SPR2_TIRE, 12, {NULL}, 0, 0, S_PLAY_FLY_TIRED}, // S_PLAY_FLY_TIRED
|
||||
|
||||
// CA_GLIDEANDCLIMB
|
||||
|
|
13
src/p_user.c
13
src/p_user.c
|
@ -8180,12 +8180,18 @@ static void P_MovePlayer(player_t *player)
|
|||
if (P_MobjFlip(player->mo)*player->mo->momz < FixedMul(5*actionspd, player->mo->scale))
|
||||
P_SetObjectMomZ(player->mo, actionspd/2, true);
|
||||
|
||||
P_SetPlayerMobjState(player->mo, player->mo->state->nextstate);
|
||||
|
||||
player->fly1--;
|
||||
}
|
||||
}
|
||||
|
||||
// Tails Put-Put noise
|
||||
if (player->charability == CA_FLY && player->bot != 1 && leveltime % 10 == 0 && !player->spectator)
|
||||
if (player->charability == CA_FLY
|
||||
&& player->bot != 1
|
||||
&& !(player->mo->eflags & MFE_UNDERWATER)
|
||||
&& leveltime % 10 == 0
|
||||
&& !player->spectator)
|
||||
S_StartSound(player->mo, sfx_putput);
|
||||
|
||||
// Descend
|
||||
|
@ -8202,6 +8208,7 @@ static void P_MovePlayer(player_t *player)
|
|||
|
||||
if (player->charability == CA_FLY && (leveltime % 10 == 0)
|
||||
&& player->mo->state-states == S_PLAY_FLY_TIRED
|
||||
&& !(player->mo->eflags & MFE_UNDERWATER)
|
||||
&& !player->spectator)
|
||||
S_StartSound(player->mo, sfx_pudpud);
|
||||
}
|
||||
|
@ -10736,8 +10743,10 @@ static void P_DoTailsOverlay(player_t *player, mobj_t *tails)
|
|||
}
|
||||
}
|
||||
|
||||
#if 0
|
||||
if (player->fly1 != 0 && player->powers[pw_tailsfly] != 0 && !smilesonground)
|
||||
P_SetMobjState(tails, chosenstate);
|
||||
#endif
|
||||
|
||||
// animation...
|
||||
if (player->panim == PA_SPRING || player->panim == PA_FALL || player->mo->state-states == S_PLAY_RIDE)
|
||||
|
@ -10752,7 +10761,7 @@ static void P_DoTailsOverlay(player_t *player, mobj_t *tails)
|
|||
else if (player->mo->state-states == S_PLAY_GASP)
|
||||
tails->tics = -1;
|
||||
else if (player->mo->sprite2 == SPR2_TIRE)
|
||||
ticnum = 4;
|
||||
ticnum = (doswim ? 2 : 4);
|
||||
else if (player->panim != PA_IDLE)
|
||||
ticnum = player->mo->tics;
|
||||
|
||||
|
|
Loading…
Reference in a new issue