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

Gradual turn into drift push angle

Browse source
This commit is contained in:
Sryder 2017-03-07 03:00:10 +00:00
parent cac7171d48
commit 6b83d1cdc5
2 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/k_kart.c
View file

@ -1806,13 +1806,18 @@ static void K_KartDrift(player_t *player, boolean onground)
// Drifting: left or right? // Drifting: left or right?
if ((player->cmd.buttons & BT_DRIFTLEFT) && player->speed > (10<<16) && player->kartstuff[k_jmp] == 1 if ((player->cmd.buttons & BT_DRIFTLEFT) && player->speed > (10<<16) && player->kartstuff[k_jmp] == 1
&& player->kartstuff[k_drift] < 3 && player->kartstuff[k_drift] > -1) // && player->kartstuff[k_drift] != 1) && player->kartstuff[k_drift] < 5 && player->kartstuff[k_drift] > -1) // && player->kartstuff[k_drift] != 1)
player->kartstuff[k_drift] = 1; player->kartstuff[k_drift] = 1;
else if ((player->cmd.buttons & BT_DRIFTRIGHT) && player->speed > (10<<16) && player->kartstuff[k_jmp] == 1 else if ((player->cmd.buttons & BT_DRIFTRIGHT) && player->speed > (10<<16) && player->kartstuff[k_jmp] == 1
&& player->kartstuff[k_drift] > -3 && player->kartstuff[k_drift] < 1) // && player->kartstuff[k_drift] != -1) && player->kartstuff[k_drift] > -5 && player->kartstuff[k_drift] < 1) // && player->kartstuff[k_drift] != -1)
player->kartstuff[k_drift] = -1; player->kartstuff[k_drift] = -1;
else if (player->kartstuff[k_jmp] == 0) // || player->kartstuff[k_turndir] == 0) else if (player->kartstuff[k_jmp] == 0) // || player->kartstuff[k_turndir] == 0)
player->kartstuff[k_drift] = 0; {
if (player->kartstuff[k_drift] > 0)
player->kartstuff[k_drift]--;
else if (player->kartstuff[k_drift] < 0)
player->kartstuff[k_drift]++;
}
// Incease/decrease the drift value to continue drifting in that direction // Incease/decrease the drift value to continue drifting in that direction
if (player->kartstuff[k_spinouttimer] == 0 && player->kartstuff[k_jmp] == 1 && onground if (player->kartstuff[k_spinouttimer] == 0 && player->kartstuff[k_jmp] == 1 && onground
@ -1823,14 +1828,14 @@ static void K_KartDrift(player_t *player, boolean onground)
if (player->kartstuff[k_drift] >= 1) // Drifting to the left if (player->kartstuff[k_drift] >= 1) // Drifting to the left
{ {
player->kartstuff[k_drift]++; player->kartstuff[k_drift]++;
if (player->kartstuff[k_drift] > 3) if (player->kartstuff[k_drift] > 5)
player->kartstuff[k_drift] = 3; player->kartstuff[k_drift] = 5;
} }
else if (player->kartstuff[k_drift] <= -1) // Drifting to the right else if (player->kartstuff[k_drift] <= -1) // Drifting to the right
{ {
player->kartstuff[k_drift]--; player->kartstuff[k_drift]--;
if (player->kartstuff[k_drift] < -3) if (player->kartstuff[k_drift] < -5)
player->kartstuff[k_drift] = -3; player->kartstuff[k_drift] = -5;
} }
} }

8
src/p_user.c
View file

@ -4590,13 +4590,9 @@ static void P_3dMovement(player_t *player)
} }
else else
{ {
if (player->kartstuff[k_drift] < 0) if (player->kartstuff[k_drift] != 0)
{ {
movepushangle = player->mo->angle+ANGLE_45; movepushangle = player->mo->angle-(ANGLE_45/5)*player->kartstuff[k_drift];
}
else if (player->kartstuff[k_drift] > 0)
{
movepushangle = player->mo->angle-ANGLE_45;
} }
else else
movepushangle = player->mo->angle; movepushangle = player->mo->angle;