stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-20 19:02:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into tutorial-time

Browse source
This commit is contained in:
Monster Iestyn 2018-09-04 17:06:50 +01:00
commit df51997022
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;
fixed_t workz;
fixed_t workh;
INT8 dir;
SINT8 dir;
angle_t ang;
INT32 locvar1 = var1;
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++)
{
UINT8 lap;
if (!playeringame[i] || players[i].spectator)
continue;
@ -1599,7 +1600,7 @@ static boolean P_CheckNightsTriggerLine(line_t *triggerline, mobj_t *actor)
&& players[i].powers[pw_carry] == CR_NIGHTSMODE)
playersarenights++;
UINT8 lap = lapfrombonustime ? players[i].marebonuslap : players[i].marelap;
lap = lapfrombonustime ? players[i].marebonuslap : players[i].marelap;
// get highest mare/lap of players
if (perglobal)