From 72b87e5bd73dfbc407ec599613515ef66bbca3cb Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Mon, 21 Oct 2019 19:36:54 +0200
Subject: [PATCH] - fixed compilation.

---
 source/blood/src/credits.h  |  2 +-
 source/blood/src/demo.cpp   | 11 ++---------
 source/build/src/defs.cpp   |  6 +++---
 source/build/src/engine.cpp | 14 +++-----------
 4 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/source/blood/src/credits.h b/source/blood/src/credits.h
index f74367c70..03cbb05ae 100644
--- a/source/blood/src/credits.h
+++ b/source/blood/src/credits.h
@@ -26,6 +26,6 @@ BEGIN_BLD_NS
 
 void credLogosDos(void);
 void credReset(void);
-FileReader credPlaySmk(const char *pzSMK, const char *pzWAV, int nWAV);
+void credPlaySmk(const char *pzSMK, const char *pzWAV, int nWAV);
 
 END_BLD_NS
diff --git a/source/blood/src/demo.cpp b/source/blood/src/demo.cpp
index 725d5ca17..d4def4f94 100644
--- a/source/blood/src/demo.cpp
+++ b/source/blood/src/demo.cpp
@@ -87,7 +87,6 @@ CDemo::CDemo()
     at0 = 0;
     at1 = 0;
     at3 = 0;
-    hPFile = -1;
     hRFile = NULL;
     atb = 0;
     pFirstDemo = NULL;
@@ -105,11 +104,6 @@ CDemo::~CDemo()
     at3 = 0;
     atb = 0;
     memset(&atf, 0, sizeof(atf));
-    if (hPFile >= 0)
-    {
-        kclose(hPFile);
-        hPFile = -1;
-    }
     if (hRFile != NULL)
     {
         fclose(hRFile);
@@ -199,10 +193,9 @@ void CDemo::Close(void)
         fwrite(&atf, sizeof(DEMOHEADER), 1, hRFile);
         fwrite(&m_gameOptions, sizeof(GAMEOPTIONS), 1, hRFile);
     }
-    if (hPFile >= 0)
+    if (hPFile.isOpen())
     {
-        kclose(hPFile);
-        hPFile = -1;
+        hPFile.Close();
     }
     if (hRFile != NULL)
     {
diff --git a/source/build/src/defs.cpp b/source/build/src/defs.cpp
index d5c6dbdf0..beea87493 100644
--- a/source/build/src/defs.cpp
+++ b/source/build/src/defs.cpp
@@ -2798,7 +2798,7 @@ static int32_t defsparser(scriptfile *script)
                         break;
                     }
 
-                    if (palookupbuf >= 256*32)
+                    if (palookupbuf.Size() >= 256*32)
                     {
                         didLoadShade = 1;
                         numshades = 32;
@@ -2813,7 +2813,7 @@ static int32_t defsparser(scriptfile *script)
                             break;
                         }
 
-                        paletteMakeLookupTable(id, palookupbuf, 0,0,0, g_noFloorPal[id]);
+                        paletteMakeLookupTable(id, (char*)palookupbuf.Data(), 0,0,0, g_noFloorPal[id]);
                     }
                     break;
                 }
@@ -3091,7 +3091,7 @@ static int32_t defsparser(scriptfile *script)
                         break;
                     }
 
-                    paletteSetBlendTable(id, blendbuf);
+                    paletteSetBlendTable(id, (char*)blendbuf.Data());
                     didLoadTransluc = 1;
                     break;
                 }
diff --git a/source/build/src/engine.cpp b/source/build/src/engine.cpp
index 316531f63..6f6ac7ceb 100644
--- a/source/build/src/engine.cpp
+++ b/source/build/src/engine.cpp
@@ -8141,15 +8141,7 @@ int32_t enginePreInit(void)
 //
 int32_t engineInit(void)
 {
-    int32_t i, j;
-
-#if !defined _WIN32 && defined DEBUGGINGAIDS && !defined GEKKO
-    struct sigaction sigact, oldact;
-    memset(&sigact, 0, sizeof(sigact));
-    sigact.sa_sigaction = &sighandler;
-    sigact.sa_flags = SA_SIGINFO;
-    sigaction(SIGFPE, &sigact, &oldact);
-#endif
+    int32_t i;
 
     if (!preinitcalled)
     {
@@ -10572,7 +10564,7 @@ void videoNextPage(void)
 
 int32_t qloadkvx(int32_t voxindex, const char *filename)
 {
-    autofil = kopenFileReader(filename, 0);
+    auto fil = kopenFileReader(filename, 0);
     if (!fil.isOpen())
         return -1;
 
@@ -10585,7 +10577,7 @@ int32_t qloadkvx(int32_t voxindex, const char *filename)
 
 		voxelmemory.Reserve(1);
 		voxelmemory.Last() = fil.Read(dasiz);
-		voxoff[voxindex][i] = (intptr)voxelmemoty.Last().Data();
+		voxoff[voxindex][i] = (intptr_t)voxelmemory.Last().Data();
 
         lengcnt += dasiz+4;
         if (lengcnt >= lengtot-768)