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 'hanagumi-ringbox' into 'master'

Browse source 
Hanagumi Hall ring vent overflow (resolves #745)

Closes #745

See merge request KartKrew/Kart!1591
This commit is contained in:
Oni 2023-11-03 03:12:35 +00:00
commit b20fb26c04
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/k_kart.c
View file

@ -3657,7 +3657,7 @@ angle_t K_MomentumAngleReal(const mobj_t *mo)
} }
} }
void K_AwardPlayerRings(player_t *player, INT32 rings, boolean overload) void K_AwardPlayerRings(player_t *player, UINT16 rings, boolean overload)
{ {
UINT16 superring; UINT16 superring;
@ -3668,7 +3668,11 @@ void K_AwardPlayerRings(player_t *player, INT32 rings, boolean overload)
/* capped at 20 rings */ /* capped at 20 rings */
if ((totalrings + rings) > 20) if ((totalrings + rings) > 20)
{
if (totalrings >= 20)
return; // woah dont let that go negative buster
rings = (20 - totalrings); rings = (20 - totalrings);
}
} }
superring = player->superring + rings; superring = player->superring + rings;

2
src/k_kart.h
View file

@ -105,7 +105,7 @@ void K_KartPlayerAfterThink(player_t *player);
angle_t K_MomentumAngleEx(const mobj_t *mo, const fixed_t threshold); angle_t K_MomentumAngleEx(const mobj_t *mo, const fixed_t threshold);
angle_t K_MomentumAngleReal(const mobj_t *mo); angle_t K_MomentumAngleReal(const mobj_t *mo);
#define K_MomentumAngle(mo) K_MomentumAngleEx(mo, 6 * mo->scale) #define K_MomentumAngle(mo) K_MomentumAngleEx(mo, 6 * mo->scale)
void K_AwardPlayerRings(player_t *player, INT32 rings, boolean overload); void K_AwardPlayerRings(player_t *player, UINT16 rings, boolean overload);
void K_DoInstashield(player_t *player); void K_DoInstashield(player_t *player);
void K_DoPowerClash(mobj_t *t1, mobj_t *t2); void K_DoPowerClash(mobj_t *t1, mobj_t *t2);
void K_DoGuardBreak(mobj_t *t1, mobj_t *t2); void K_DoGuardBreak(mobj_t *t1, mobj_t *t2);