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

Merge branch 'master' into pos-hud-tweaks

Browse source
This commit is contained in:
Sally Coolatta 2021-02-03 16:55:26 -05:00
commit 8849d25e8a
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/d_player.h
View file

@ -454,6 +454,8 @@ typedef enum
#define TRICKMOMZRAMP (30) #define TRICKMOMZRAMP (30)
#define TRICKLAG (9) #define TRICKLAG (9)
#define TUMBLEBOUNCES 3
//} //}
// player_t struct for all respawn variables // player_t struct for all respawn variables

2
src/k_kart.c
View file

@ -2546,7 +2546,7 @@ void K_TumblePlayer(player_t *player, mobj_t *inflictor, mobj_t *source)
static boolean K_LastTumbleBounceCondition(player_t *player) static boolean K_LastTumbleBounceCondition(player_t *player)
{ {
return (player->tumbleBounces > 4 && player->tumbleHeight < 40); return (player->tumbleBounces > TUMBLEBOUNCES && player->tumbleHeight < 40);
} }
static void K_HandleTumbleBounce(player_t *player) static void K_HandleTumbleBounce(player_t *player)

4
src/k_respawn.c
View file

@ -122,8 +122,8 @@ void K_DoIngameRespawn(player_t *player)
// If player was tumbling, set variables so that they don't tumble like crazy after they're done respawning // If player was tumbling, set variables so that they don't tumble like crazy after they're done respawning
if (player->tumbleBounces > 0) if (player->tumbleBounces > 0)
{ {
player->tumbleBounces = 3; // Max # of bounces-1 (so you still tumble once) player->tumbleBounces = TUMBLEBOUNCES-1; // Max # of bounces-1 (so you still tumble once)
player->tumbleLastBounce = 0; // Still force them to bounce at least once for the funny player->tumbleLastBounce = false; // Still force them to bounce at least once for the funny
players->tumbleHeight = 20; // force tumble height players->tumbleHeight = 20; // force tumble height
} }