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

Merge branch 'spb-shrink' into 'master'

Browse source 
Make SPB respond to player physics scale (resolves #560)

Closes #560

See merge request KartKrew/Kart!1276
This commit is contained in:
Sal 2023-06-15 05:59:38 +00:00
commit 7d82d8cd0c
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/objects/spb.c
View file

@ -678,6 +678,12 @@ static void SPBChase(mobj_t *spb, mobj_t *bestMobj)
UINT8 spark = ((10 - chasePlayer->kartspeed) + chasePlayer->kartweight) / 2; UINT8 spark = ((10 - chasePlayer->kartspeed) + chasePlayer->kartweight) / 2;
fixed_t easiness = ((chasePlayer->kartspeed + (10 - spark)) << FRACBITS) / 2; fixed_t easiness = ((chasePlayer->kartspeed + (10 - spark)) << FRACBITS) / 2;
fixed_t scaleAdjust = FRACUNIT;
if (chase->scale > mapobjectscale)
scaleAdjust = GROW_PHYSICS_SCALE;
if (chase->scale < mapobjectscale)
scaleAdjust = SHRINK_PHYSICS_SCALE;
spb_lastplayer(spb) = chasePlayer - players; // Save the player num for death scumming... spb_lastplayer(spb) = chasePlayer - players; // Save the player num for death scumming...
spbplace = chasePlayer->position; spbplace = chasePlayer->position;
@ -693,7 +699,7 @@ static void SPBChase(mobj_t *spb, mobj_t *bestMobj)
// 7/8ths max speed for Knuckles, 3/4ths max speed for min accel, exactly max speed for max accel // 7/8ths max speed for Knuckles, 3/4ths max speed for min accel, exactly max speed for max accel
baseSpeed = FixedMul( baseSpeed = FixedMul(
((fracmax+1) << FRACBITS) - easiness, ((fracmax+1) << FRACBITS) - easiness,
K_GetKartSpeed(chasePlayer, false, false) FixedMul(K_GetKartSpeed(chasePlayer, false, false), scaleAdjust)
) / fracmax; ) / fracmax;
} }