From 54d65bfcfce98448ce39b580e4e142c472115884 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Mon, 31 Aug 2020 19:28:05 +0200
Subject: [PATCH] - fixed some warnings

---
 source/core/statusbar.cpp      | 2 +-
 source/exhumed/src/2d.cpp      | 1 -
 source/exhumed/src/exhumed.cpp | 7 -------
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/source/core/statusbar.cpp b/source/core/statusbar.cpp
index 8bd2e2084..92b85cb1f 100644
--- a/source/core/statusbar.cpp
+++ b/source/core/statusbar.cpp
@@ -826,7 +826,7 @@ short DBaseStatusBar::CalcMagazineAmount(short ammo_remaining, short clip_capaci
 	short clip_current = ammo_remaining != 0 && clip_amount == 0 ? clip_capacity : clip_amount;
 
 	// Return current clip value if weapon has rounds or is not on a reload cycle.
-	return ammo_remaining == 0 || reloading && clip_amount == 0 ? 0 : clip_current;
+	return ammo_remaining == 0 || (reloading && clip_amount == 0) ? 0 : clip_current;
 }
 
 //============================================================================
diff --git a/source/exhumed/src/2d.cpp b/source/exhumed/src/2d.cpp
index a94e8b7c4..b72e134d6 100644
--- a/source/exhumed/src/2d.cpp
+++ b/source/exhumed/src/2d.cpp
@@ -1002,7 +1002,6 @@ class DLastLevelCinema : public DScreenJob
     int var_28 = 12;
 
     int ebp;
-    int nEndTime = 240;
     int phase = 0;
     int nextclock = 4;
     unsigned int nStringTypeOn, nCharTypeOn;
diff --git a/source/exhumed/src/exhumed.cpp b/source/exhumed/src/exhumed.cpp
index 4ca440c7c..35bba9313 100644
--- a/source/exhumed/src/exhumed.cpp
+++ b/source/exhumed/src/exhumed.cpp
@@ -308,13 +308,6 @@ void mysetbrightness(char nBrightness)
     g_visibility = 2048 - (nBrightness << 9);
 }
 
-// Replicate original DOS EXE behaviour when pointer is null
-static const char *safeStrtok(char *s, const char *d)
-{
-    const char *r = strtok(s, d);
-    return r ? r : "";
-}
-
 
 void DoClockBeep()
 {