From 2dda3ee505efab19c5914ef86e621aba4a68473e Mon Sep 17 00:00:00 2001
From: Mitchell Richters <mjr4077au@gmail.com>
Date: Tue, 7 Dec 2021 23:27:12 +0100
Subject: [PATCH] - Tidy up some GCC warnings about ininitialised variables,
 memsetting non-trivial types and some others.

---
 source/core/defparser.cpp          |  4 ++--
 source/games/blood/src/player.cpp  |  5 +++--
 source/games/duke/src/ccmds.cpp    | 14 +++++++-------
 source/games/duke/src/gameexec.cpp |  2 +-
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/source/core/defparser.cpp b/source/core/defparser.cpp
index 422e76bd4..cd66851c1 100644
--- a/source/core/defparser.cpp
+++ b/source/core/defparser.cpp
@@ -890,7 +890,7 @@ void parseMultiPsky(FScanner& sc, FScriptPosition& pos)
 		else if (sc.Compare("yscale")) sc.GetNumber(sky.yscale, true);
 		else if (sc.Compare({ "tile", "panel" }))
 		{
-			int panel, offset;
+			int panel = 0, offset = 0;
 			sc.GetNumber(panel, true);
 			sc.GetNumber(offset, true);
 			if ((unsigned)panel < MAXPSKYTILES && (unsigned)offset <= PSKYOFF_MAX) sky.tileofs[panel] = offset;
@@ -1441,7 +1441,7 @@ void parsePalookup(FScanner& sc, FScriptPosition& pos)
 		else if (sc.Compare("nofloorpal")) lookups.tables[id].noFloorPal = 1;
 		else if (sc.Compare("copy"))
 		{
-			int source;
+			int source = 0;
 			sc.GetNumber(source, true);
 
 			if ((unsigned)source >= MAXPALOOKUPS || source == id)
diff --git a/source/games/blood/src/player.cpp b/source/games/blood/src/player.cpp
index 9ca6d5d5b..8ba7b4e71 100644
--- a/source/games/blood/src/player.cpp
+++ b/source/games/blood/src/player.cpp
@@ -835,9 +835,10 @@ int team_ticker[8];
 
 void playerInit(int nPlayer, unsigned int a2)
 {
-    PLAYER *pPlayer = &gPlayer[nPlayer];
     if (!(a2&1))
-        memset(pPlayer, 0, sizeof(PLAYER));
+        gPlayer[nPlayer] = {};
+
+    PLAYER *pPlayer = &gPlayer[nPlayer];
     pPlayer->nPlayer = nPlayer;
     pPlayer->teamId = nPlayer;
     if (gGameOptions.nGameType == 3)
diff --git a/source/games/duke/src/ccmds.cpp b/source/games/duke/src/ccmds.cpp
index 5f3b731a2..ed15fc13b 100644
--- a/source/games/duke/src/ccmds.cpp
+++ b/source/games/duke/src/ccmds.cpp
@@ -99,13 +99,13 @@ static int ccmd_spawn(CCmdFuncPtr parm)
 		if (set & 1) spawned->s->pal = (uint8_t)pal;
 		if (set & 2) spawned->s->cstat = (uint16_t)cstat;
 		if (set & 4) spawned->s->ang = ang;
-		if (set & 8)
-			SetActor(spawned, { x, y, z });
-			if (spawned->sector() == nullptr)
-			{
-				Printf("spawn: Sprite can't be spawned into null space\n");
-				deletesprite(spawned);
-			}
+		if (set & 8) SetActor(spawned, { x, y, z });
+
+		if (spawned->sector() == nullptr)
+		{
+			Printf("spawn: Sprite can't be spawned into null space\n");
+			deletesprite(spawned);
+		}
 	}
 
 	return CCMD_OK;
diff --git a/source/games/duke/src/gameexec.cpp b/source/games/duke/src/gameexec.cpp
index 67aec795a..ea3a238ea 100644
--- a/source/games/duke/src/gameexec.cpp
+++ b/source/games/duke/src/gameexec.cpp
@@ -2622,7 +2622,7 @@ int ParseState::parse(void)
 		{
 			DPrintf(DMSG_NOTIFY, " (Global)");
 		}
-		DPrintf(DMSG_NOTIFY, " =%d",	GetGameVarID(*insptr, g_ac, g_p));
+		DPrintf(DMSG_NOTIFY, " =%d",	GetGameVarID(*insptr, g_ac, g_p).safeValue());
 		insptr++;
 		break;
 	}