thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 04:21:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Faster z speed in the air

Browse source
This commit is contained in:
Sally Coolatta 2024-03-26 21:59:49 -04:00
parent 4004bffa5d
commit 7e8a42c4a0
3 changed files with 41 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/d_player.h
View file

@ -310,6 +310,7 @@ typedef enum
khud_boostcam, // Camera push forward on boost khud_boostcam, // Camera push forward on boost
khud_destboostcam, // Ditto khud_destboostcam, // Ditto
khud_timeovercam, // Camera timer for leaving behind or not khud_timeovercam, // Camera timer for leaving behind or not
khud_aircam, // Camera follows vertically better in the air
// Sounds // Sounds
khud_enginesnd, // Engine sound offset this player is using. khud_enginesnd, // Engine sound offset this player is using.

29
src/k_kart.c
View file

@ -8537,6 +8537,35 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
//CONS_Printf("cam: %d, dest: %d\n", player->karthud[khud_boostcam], player->karthud[khud_destboostcam]); //CONS_Printf("cam: %d, dest: %d\n", player->karthud[khud_boostcam], player->karthud[khud_destboostcam]);
} }
if (onground)
{
if (player->karthud[khud_aircam] > 0)
{
player->karthud[khud_aircam] -= FRACUNIT / 5;
if (player->karthud[khud_aircam] < 0)
{
player->karthud[khud_aircam] = 0;
}
//CONS_Printf("cam: %f\n", FixedToFloat(player->karthud[khud_aircam]));
}
}
else
{
if (player->karthud[khud_aircam] < FRACUNIT)
{
player->karthud[khud_aircam] += FRACUNIT / TICRATE;
if (player->karthud[khud_aircam] > FRACUNIT)
{
player->karthud[khud_aircam] = FRACUNIT;
}
//CONS_Printf("cam: %f\n", FixedToFloat(player->karthud[khud_aircam]));
}
}
// Make ABSOLUTELY SURE that your flashing tics don't get set WHILE you're still in hit animations. // Make ABSOLUTELY SURE that your flashing tics don't get set WHILE you're still in hit animations.
if (player->spinouttimer != 0) if (player->spinouttimer != 0)
{ {

12
src/p_user.c
View file

@ -70,6 +70,7 @@
#include "k_endcam.h" #include "k_endcam.h"
#include "k_credits.h" #include "k_credits.h"
#include "k_hud.h" // K_AddMessage #include "k_hud.h" // K_AddMessage
#include "m_easing.h"
#ifdef HWRENDER #ifdef HWRENDER
#include "hardware/hw_light.h" #include "hardware/hw_light.h"
@ -3458,6 +3459,7 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
if (mo->standingslope) if (mo->standingslope)
{ {
pitch = (angle_t)FixedMul(P_ReturnThrustX(mo, thiscam->angle - mo->standingslope->xydirection, FRACUNIT), (fixed_t)mo->standingslope->zangle); pitch = (angle_t)FixedMul(P_ReturnThrustX(mo, thiscam->angle - mo->standingslope->xydirection, FRACUNIT), (fixed_t)mo->standingslope->zangle);
if (mo->eflags & MFE_VERTICALFLIP) if (mo->eflags & MFE_VERTICALFLIP)
{ {
if (pitch >= ANGLE_180) if (pitch >= ANGLE_180)
@ -3469,6 +3471,7 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
pitch = 0; pitch = 0;
} }
} }
pitch = thiscam->pitch + (angle_t)FixedMul(pitch - thiscam->pitch, camspeed/4); pitch = thiscam->pitch + (angle_t)FixedMul(pitch - thiscam->pitch, camspeed/4);
if (rendermode == render_opengl && !cv_glshearing.value) if (rendermode == render_opengl && !cv_glshearing.value)
@ -3559,7 +3562,14 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
{ {
thiscam->momx = x - thiscam->x; thiscam->momx = x - thiscam->x;
thiscam->momy = y - thiscam->y; thiscam->momy = y - thiscam->y;
thiscam->momz = FixedMul(z - thiscam->z, camspeed*3/5);
fixed_t z_speed = Easing_Linear(
player->karthud[khud_aircam],
camspeed * 3 / 5,
camspeed
);
thiscam->momz = FixedMul(z - thiscam->z, z_speed);
} }
thiscam->pan = pan; thiscam->pan = pan;