vivlim
/
Kart-Public
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix wheel animations

This commit is contained in:
TehRealSalt 2019-05-02 00:44:04 -04:00
parent db2935d45a
commit f99a5a6a8b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/g_game.c
View File

@ -5283,7 +5283,7 @@ void G_ReadMetalTic(mobj_t *metal)
speed = FixedDiv(P_AproxDistance(oldmetal.momx, oldmetal.momy), metal->scale)>>FRACBITS; speed = FixedDiv(P_AproxDistance(oldmetal.momx, oldmetal.momy), metal->scale)>>FRACBITS;
// Use speed to decide an appropriate state // Use speed to decide an appropriate state
if (speed > 28) // default skin runspeed if (speed > 20) // default skin runspeed
statetype = 2; statetype = 2;
else if (speed > 1) // stopspeed else if (speed > 1) // stopspeed
statetype = 1; statetype = 1;

4
src/k_kart.c
View File

@ -1634,7 +1634,7 @@ void K_KartMoveAnimation(player_t *player)
P_SetPlayerMobjState(player->mo, S_KART_DRIFT1_R); P_SetPlayerMobjState(player->mo, S_KART_DRIFT1_R);
} }
// Run frames - S_KART_RUN1 S_KART_RUN1_L S_KART_RUN1_R // Run frames - S_KART_RUN1 S_KART_RUN1_L S_KART_RUN1_R
else if (player->speed > FixedMul(player->runspeed, player->mo->scale)) else if (player->speed > (20*player->mo->scale))
{ {
if (cmd->driftturn < 0 && !(player->mo->state >= &states[S_KART_RUN1_R] && player->mo->state <= &states[S_KART_RUN2_R])) if (cmd->driftturn < 0 && !(player->mo->state >= &states[S_KART_RUN1_R] && player->mo->state <= &states[S_KART_RUN2_R]))
P_SetPlayerMobjState(player->mo, S_KART_RUN1_R); P_SetPlayerMobjState(player->mo, S_KART_RUN1_R);
@ -1644,7 +1644,7 @@ void K_KartMoveAnimation(player_t *player)
P_SetPlayerMobjState(player->mo, S_KART_RUN1); P_SetPlayerMobjState(player->mo, S_KART_RUN1);
} }
// Walk frames - S_KART_WALK1 S_KART_WALK1_L S_KART_WALK1_R // Walk frames - S_KART_WALK1 S_KART_WALK1_L S_KART_WALK1_R
else if (player->speed <= FixedMul(player->runspeed, player->mo->scale)) else if (player->speed <= (20*player->mo->scale))
{ {
if (cmd->driftturn < 0 && !(player->mo->state >= &states[S_KART_WALK1_R] && player->mo->state <= &states[S_KART_WALK2_R])) if (cmd->driftturn < 0 && !(player->mo->state >= &states[S_KART_WALK1_R] && player->mo->state <= &states[S_KART_WALK2_R]))
P_SetPlayerMobjState(player->mo, S_KART_WALK1_R); P_SetPlayerMobjState(player->mo, S_KART_WALK1_R);