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

Merge remote-tracking branch 'refs/remotes/origin/master' into democracy

This commit is contained in:
TehRealSalt 2018-02-08 21:24:56 -05:00
parent 98fa8c1409 844b1dc2c0
commit 70f959815a
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/k_kart.c
View File

@ -3847,7 +3847,7 @@ void K_CheckBalloons(void)
{ {
UINT8 i; UINT8 i;
UINT8 numingame = 0; UINT8 numingame = 0;
INT8 winnernum = -1; SINT8 winnernum = -1;
#if 0 #if 0
return; // set to 1 to test comeback mechanics while alone return; // set to 1 to test comeback mechanics while alone

1
src/p_mobj.c
View File

@ -1400,6 +1400,7 @@ fixed_t P_GetMobjGravity(mobj_t *mo)
break; break;
case MT_WATERDROP: case MT_WATERDROP:
gravityadd >>= 1; gravityadd >>= 1;
break;
case MT_BANANAITEM: case MT_BANANAITEM:
case MT_FAKEITEM: case MT_FAKEITEM:
case MT_BOMBITEM: case MT_BOMBITEM:

1
src/v_video.c
View File

@ -1262,6 +1262,7 @@ void V_DrawKartString(INT32 x, INT32 y, INT32 option, const char *string)
{ {
case V_MONOSPACE: case V_MONOSPACE:
spacewidth = 12; spacewidth = 12;
/* FALLTHRU */
case V_OLDSPACING: case V_OLDSPACING:
charwidth = 12; charwidth = 12;
break; break;