thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add PA_EDGE to handle Super teeter animation bug.

Browse source 
States were being improperly checked where a panim
would be more appropriate.
This commit is contained in:
Yukita Mayako 2015-06-18 11:36:08 -04:00
parent b17e39a701
commit ffec58c09c
4 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/d_player.h
View file

@ -161,6 +161,7 @@ typedef enum
// Are animation frames playing? // Are animation frames playing?
PA_ETC=0, PA_ETC=0,
PA_IDLE, PA_IDLE,
PA_EDGE,
PA_WALK, PA_WALK,
PA_RUN, PA_RUN,
PA_PAIN, PA_PAIN,

1
src/dehacked.c
View file

@ -7665,6 +7665,7 @@ struct {
// Player animation (panim_t) // Player animation (panim_t)
{"PA_ETC",PA_ETC}, {"PA_ETC",PA_ETC},
{"PA_IDLE",PA_IDLE}, {"PA_IDLE",PA_IDLE},
{"PA_EDGE",PA_EDGE},
{"PA_WALK",PA_WALK}, {"PA_WALK",PA_WALK},
{"PA_RUN",PA_RUN}, {"PA_RUN",PA_RUN},
{"PA_PAIN",PA_PAIN}, {"PA_PAIN",PA_PAIN},

6
src/p_mobj.c
View file

@ -183,11 +183,13 @@ boolean P_SetPlayerMobjState(mobj_t *mobj, statenum_t state)
{ {
case S_PLAY_STND: case S_PLAY_STND:
case S_PLAY_WAIT: case S_PLAY_WAIT:
case S_PLAY_EDGE:
case S_PLAY_SUPER_STND: case S_PLAY_SUPER_STND:
case S_PLAY_SUPER_EDGE:
player->panim = PA_IDLE; player->panim = PA_IDLE;
break; break;
case S_PLAY_EDGE:
case S_PLAY_SUPER_EDGE:
player->panim = PA_EDGE;
break;
case S_PLAY_WALK: case S_PLAY_WALK:
case S_PLAY_SUPER_WALK: case S_PLAY_SUPER_WALK:
player->panim = PA_WALK; player->panim = PA_WALK;

6
src/p_user.c
View file

@ -3078,10 +3078,10 @@ teeterdone:
} }
if (teeter) if (teeter)
{ {
if (player->panim == PA_IDLE && player->mo->state-states != S_PLAY_EDGE) if (player->panim == PA_IDLE)
P_SetPlayerMobjState(player->mo, S_PLAY_EDGE); P_SetPlayerMobjState(player->mo, S_PLAY_EDGE);
} }
else if (checkedforteeter && (player->mo->state-states == S_PLAY_EDGE || player->mo->state-states == S_PLAY_SUPER_EDGE)) else if (checkedforteeter && player->panim == PA_EDGE)
P_SetPlayerMobjState(player->mo, S_PLAY_STND); P_SetPlayerMobjState(player->mo, S_PLAY_STND);
} }
@ -6884,7 +6884,7 @@ static void P_MovePlayer(player_t *player)
} }
// Make sure you're not teetering when you shouldn't be. // Make sure you're not teetering when you shouldn't be.
if ((player->mo->state-states == S_PLAY_EDGE || player->mo->state-states == S_PLAY_SUPER_EDGE) if (player->panim == PA_EDGE
&& (player->mo->momx || player->mo->momy || player->mo->momz)) && (player->mo->momx || player->mo->momy || player->mo->momz))
P_SetPlayerMobjState(player->mo, S_PLAY_STND); P_SetPlayerMobjState(player->mo, S_PLAY_STND);