vivlim
/
Kart-Public
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

This little thing slipped by the merge

This commit is contained in:
TehRealSalt 2018-04-02 06:43:03 -04:00
parent 428a134cda
commit eaaf708381
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/d_player.h
View File

@ -292,7 +292,7 @@ typedef enum
k_boostcharge, // Charge-up for boosting at the start of the race, or when Lakitu drops you
k_jmp, // In Mario Kart, letting go of the jump button stops the drift
k_offroad, // In Super Mario Kart, going offroad has lee-way of about 1 second before you start losing speed
k_pogospring, // Pogo spring effect
k_pogospring, // Pogo spring bounce effect
k_itemroulette, // Used for the roulette when deciding what item to give you (was "pw_kartitem")

2
src/p_user.c
View File

@ -8858,7 +8858,7 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
&& thiscam->z < thiscam->subsector->sector->floorheight + 256*FRACUNIT
&& FixedMul(z - thiscam->z, camspeed) < 0)
#if 0
|| player->kartstuff[k_feather] & 2 // SRB2Kart: don't follow while bouncing, experimental
|| player->kartstuff[k_pogospring] // SRB2Kart: don't follow while bouncing, experimental
#endif
)
thiscam->momz = 0; // Don't go down a death pit