From 2b0ce807c752e435c6eaf5a127732808ff0fe9f1 Mon Sep 17 00:00:00 2001
From: Monster Iestyn <iestynjealous@ntlworld.com>
Date: Tue, 4 Sep 2018 17:04:24 +0100
Subject: [PATCH] Fix mixed d+c in NiGHTS trigger code, fix stray "INT8" in
A_ConnectToGround
---
src/p_enemy.c | 2 +-
src/p_spec.c | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/p_enemy.c b/src/p_enemy.c
index 9235a1d0f1..52044dfae6 100644
--- a/src/p_enemy.c
+++ b/src/p_enemy.c
@@ -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;
diff --git a/src/p_spec.c b/src/p_spec.c
index e5c48dcaa1..6c359c9ccb 100644
--- a/src/p_spec.c
+++ b/src/p_spec.c
@@ -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)
--
GitLab