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

Merge branch 'slope-pushback-scale' into 'master'

Browse source 
Fix slope pushback force to scale with mapobject and player grow/shrink scale

See merge request KartKrew/Kart!2361
This commit is contained in:
Oni 2024-05-05 00:01:25 +00:00
commit 3067b827f1
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/g_demo.cpp
View file

@ -166,8 +166,12 @@ demoghost *ghosts = NULL;
// - A bug was preventing control after ending a drift.
// Older behavior is kept around for staff ghost compat.
// - Also, polyobject bounce-back was fixed!
// - 0x000B (Ring Racers v2.1 + In dev revisions)
// - SPB cup TA replays were recorded at this time
// - Slope physics changed with a scaling fix
// - 0x000C (Ring Racers v2.2)
#define DEMOVERSION 0x000B
#define DEMOVERSION 0x000C
boolean G_CompatLevel(UINT16 level)
{

6
src/p_user.c
View file

@ -1917,7 +1917,11 @@ static void P_3dMovement(player_t *player)
vector3_t totalthrust;
totalthrust.x = totalthrust.y = 0; // I forget if this is needed
totalthrust.z = FRACUNIT*P_MobjFlip(player->mo)/3; // A bit of extra push-back on slopes
if (G_CompatLevel(0x000B)) // Ring Racers 2.1 behavior
totalthrust.z = FRACUNIT*P_MobjFlip(player->mo)/3; // A bit of extra push-back on slopes
else
totalthrust.z = FixedMul(mapobjectscale, K_GrowShrinkSpeedMul(player))*P_MobjFlip(player->mo)/3; // A bit of extra push-back on slopes, but scaled for mapobject and player size
if (K_SlopeResistance(player) == true)
{