thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-05-10 10:51:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allow lookback/glancing in the air, glance back while braking

Browse source
This commit is contained in:
Sally Coolatta 2021-02-04 21:11:27 -05:00
parent 73c61b1010
commit efeab5e80e
1 changed files with 114 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

240
src/k_kart.c
View file

@ -1839,18 +1839,19 @@ static SINT8 K_GlanceAtPlayers(player_t *glancePlayer)
void K_KartMoveAnimation(player_t *player) void K_KartMoveAnimation(player_t *player)
{ {
const INT16 minturn = KART_FULLTURN/8; const INT16 minturn = KART_FULLTURN/8;
SINT8 turndir = 0;
const fixed_t fastspeed = (K_GetKartSpeed(player, false) * 17) / 20; // 85% fixed_t fastspeed = (K_GetKartSpeed(player, false) * 17) / 20; // 85%
const fixed_t speedthreshold = player->mo->scale / 8; fixed_t speedthreshold = player->mo->scale / 8;
const boolean onground = P_IsObjectOnGround(player->mo); boolean onground = P_IsObjectOnGround(player->mo);
ticcmd_t *cmd = &player->cmd; ticcmd_t *cmd = &player->cmd;
const boolean spinningwheels = ((cmd->buttons & BT_ACCELERATE) || (onground && player->speed > 0)); boolean spinningwheels = (((cmd->buttons & BT_ACCELERATE) == BT_ACCELERATE) || (onground && player->speed > 0));
const boolean lookback = (cmd->buttons & BT_LOOKBACK); boolean lookback = ((cmd->buttons & BT_LOOKBACK) == BT_LOOKBACK);
SINT8 turndir = 0;
SINT8 destGlanceDir = 0; SINT8 destGlanceDir = 0;
SINT8 drift = player->kartstuff[k_drift];
if (cmd->turning < -minturn) if (cmd->turning < -minturn)
{ {
@ -1861,100 +1862,16 @@ void K_KartMoveAnimation(player_t *player)
turndir = 1; turndir = 1;
} }
#define SetState(sn) \ if (lookback == true && drift == 0)
if (player->mo->state != &states[sn]) \
P_SetPlayerMobjState(player->mo, sn)
if (!onground)
{ {
// Only use certain frames in the air, to make it look like your tires are spinning fruitlessly! // Prioritize looking back frames over turning
if (player->kartstuff[k_drift] > 0)
{
// Neutral drift
SetState(S_KART_DRIFT_L);
}
else if (player->kartstuff[k_drift] > 0)
{
// Neutral drift
SetState(S_KART_DRIFT_R);
}
else
{
if (turndir == -1)
{
SetState(S_KART_FAST_R);
}
else if (turndir == 1)
{
SetState(S_KART_FAST_L);
}
else if (turndir == 0)
{
SetState(S_KART_FAST);
}
}
if (!spinningwheels)
{
// TODO: These should prooobably be different SPR2s
// Just a quick hack to prevent needing to do that :V
player->mo->frame = (player->mo->frame & ~FF_FRAMEMASK);
}
}
else
{
if (player->kartstuff[k_drift] > 0)
{
// Drifting LEFT!
if (turndir == -1)
{
// Right -- outwards drift
SetState(S_KART_DRIFT_L_OUT);
}
else if (turndir == 1)
{
// Left -- inwards drift
SetState(S_KART_DRIFT_L_IN);
}
else
{
// Neutral drift
SetState(S_KART_DRIFT_L);
}
}
else if (player->kartstuff[k_drift] < 0)
{
// Drifting RIGHT!
if (turndir == -1)
{
// Right -- inwards drift
SetState(S_KART_DRIFT_R_IN);
}
else if (turndir == 1)
{
// Left -- outwards drift
SetState(S_KART_DRIFT_R_OUT);
}
else
{
// Neutral drift
SetState(S_KART_DRIFT_R);
}
}
else
{
if (lookback == true)
{
// Prioritize looking back over turning
turndir = 0; turndir = 0;
} }
if (turndir == 0) if (turndir == 0 && drift == 0)
{ {
// Only try glancing if you're driving straight. // Only try glancing if you're driving straight.
// This avoids all-players loops when we don't need it.
destGlanceDir = K_GlanceAtPlayers(player); destGlanceDir = K_GlanceAtPlayers(player);
if (lookback == true) if (lookback == true)
@ -1985,6 +1902,27 @@ void K_KartMoveAnimation(player_t *player)
destGlanceDir *= 2; destGlanceDir *= 2;
} }
} }
else if (K_GetForwardMove(player) < 0 && destGlanceDir == 0)
{
// Reversing -- like looking back, but doesn't stack on the other glances.
if (player->glanceDir != 0)
{
// Keep to the side you were already on.
if (player->glanceDir < 0)
{
destGlanceDir = -1;
}
else
{
destGlanceDir = 1;
}
}
else
{
// Look to your right by default
destGlanceDir = -1;
}
}
} }
else else
{ {
@ -1993,6 +1931,110 @@ void K_KartMoveAnimation(player_t *player)
player->glanceDir = 0; player->glanceDir = 0;
} }
#define SetState(sn) \
if (player->mo->state != &states[sn]) \
P_SetPlayerMobjState(player->mo, sn)
if (onground == false)
{
// Only use certain frames in the air, to make it look like your tires are spinning fruitlessly!
if (drift > 0)
{
// Neutral drift
SetState(S_KART_DRIFT_L);
}
else if (drift < 0)
{
// Neutral drift
SetState(S_KART_DRIFT_R);
}
else
{
if (turndir == -1)
{
SetState(S_KART_FAST_R);
}
else if (turndir == 1)
{
SetState(S_KART_FAST_L);
}
else
{
switch (player->glanceDir)
{
case -2:
SetState(S_KART_FAST_LOOK_R);
break;
case 2:
SetState(S_KART_FAST_LOOK_L);
break;
case -1:
SetState(S_KART_FAST_GLANCE_R);
break;
case 1:
SetState(S_KART_FAST_GLANCE_L);
break;
default:
SetState(S_KART_FAST);
break;
}
}
}
if (!spinningwheels)
{
// TODO: The "tires still in the air" states should have it's own SPR2s.
// This was a quick hack to get the same functionality with less work,
// but it's really dunderheaded & isn't customizable at all.
player->mo->frame = (player->mo->frame & ~FF_FRAMEMASK);
player->mo->tics++; // Makes it properly use frame 0
}
}
else
{
if (drift > 0)
{
// Drifting LEFT!
if (turndir == -1)
{
// Right -- outwards drift
SetState(S_KART_DRIFT_L_OUT);
}
else if (turndir == 1)
{
// Left -- inwards drift
SetState(S_KART_DRIFT_L_IN);
}
else
{
// Neutral drift
SetState(S_KART_DRIFT_L);
}
}
else if (drift < 0)
{
// Drifting RIGHT!
if (turndir == -1)
{
// Right -- inwards drift
SetState(S_KART_DRIFT_R_IN);
}
else if (turndir == 1)
{
// Left -- outwards drift
SetState(S_KART_DRIFT_R_OUT);
}
else
{
// Neutral drift
SetState(S_KART_DRIFT_R);
}
}
else
{
if (player->speed >= fastspeed && player->speed >= (player->lastspeed - speedthreshold)) if (player->speed >= fastspeed && player->speed >= (player->lastspeed - speedthreshold))
{ {
// Going REAL fast! // Going REAL fast!
@ -2098,8 +2140,12 @@ void K_KartMoveAnimation(player_t *player)
} }
} }
} }
}
}
// Update your value to smooth it out. #undef SetState
// Update your glance value to smooth it out.
if (player->glanceDir > destGlanceDir) if (player->glanceDir > destGlanceDir)
{ {
player->glanceDir--; player->glanceDir--;
@ -2108,10 +2154,6 @@ void K_KartMoveAnimation(player_t *player)
{ {
player->glanceDir++; player->glanceDir++;
} }
}
}
#undef SetState
// Update lastspeed value -- we use to display slow driving frames instead of fast driving when slowing down. // Update lastspeed value -- we use to display slow driving frames instead of fast driving when slowing down.
player->lastspeed = player->speed; player->lastspeed = player->speed;