lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix mixed d+c in NiGHTS trigger code, fix stray "INT8" in A_ConnectToGround

This commit is contained in:
Monster Iestyn 2018-09-04 17:04:24 +01:00
parent 2ac50cd2b7
commit 2b0ce807c7
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/p_enemy.c
View File

@ -11378,7 +11378,7 @@ void A_ConnectToGround(mobj_t *actor)
mobj_t *work; mobj_t *work;
fixed_t workz; fixed_t workz;
fixed_t workh; fixed_t workh;
INT8 dir; SINT8 dir;
angle_t ang; angle_t ang;
INT32 locvar1 = var1; INT32 locvar1 = var1;
INT32 locvar2 = var2; INT32 locvar2 = var2;

3
src/p_spec.c
View File

@ -1586,6 +1586,7 @@ static boolean P_CheckNightsTriggerLine(line_t *triggerline, mobj_t *actor)
for (i = 0; i < MAXPLAYERS; i++) for (i = 0; i < MAXPLAYERS; i++)
{ {
UINT8 lap;
if (!playeringame[i] || players[i].spectator) if (!playeringame[i] || players[i].spectator)
continue; continue;
@ -1599,7 +1600,7 @@ static boolean P_CheckNightsTriggerLine(line_t *triggerline, mobj_t *actor)
&& players[i].powers[pw_carry] == CR_NIGHTSMODE) && players[i].powers[pw_carry] == CR_NIGHTSMODE)
playersarenights++; playersarenights++;
UINT8 lap = lapfrombonustime ? players[i].marebonuslap : players[i].marelap; lap = lapfrombonustime ? players[i].marebonuslap : players[i].marelap;
// get highest mare/lap of players // get highest mare/lap of players
if (perglobal) if (perglobal)