From 45cc95401f53f0142d4cf47f7ca59003f049c594 Mon Sep 17 00:00:00 2001
From: Mitchell Richters <mjr4077au@gmail.com>
Date: Fri, 22 May 2020 00:25:41 +1000
Subject: [PATCH] SW: Make game compile after upstream backports.

---
 source/sw/CMakeLists.txt   |  1 +
 source/sw/src/game.h       |  1 +
 source/sw/src/interpso.cpp | 10 ++++++++--
 source/sw/src/interpso.h   |  4 ++++
 source/sw/src/jsector.cpp  |  2 +-
 source/sw/src/save.cpp     |  3 +--
 source/sw/src/saveable.cpp |  1 +
 7 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/source/sw/CMakeLists.txt b/source/sw/CMakeLists.txt
index 3405bd5a8..892ae708d 100644
--- a/source/sw/CMakeLists.txt
+++ b/source/sw/CMakeLists.txt
@@ -26,6 +26,7 @@ set( PCH_SOURCES
 	src/hornet.cpp
 	src/interp.cpp
 	src/interpsh.cpp
+	src/interpso.cpp
 	src/inv.cpp
 	#src/jbhlp.cpp
 	src/jplayer.cpp
diff --git a/source/sw/src/game.h b/source/sw/src/game.h
index eeb53f4d9..a466c76d5 100644
--- a/source/sw/src/game.h
+++ b/source/sw/src/game.h
@@ -36,6 +36,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #pragma warning(disable:4101) // there's too many of these... :(
 #endif
 
+#include "build.h"
 #include "compat.h"
 #include "baselayer.h"
 #include "mmulti.h"
diff --git a/source/sw/src/interpso.cpp b/source/sw/src/interpso.cpp
index cc8616990..99199f1fe 100644
--- a/source/sw/src/interpso.cpp
+++ b/source/sw/src/interpso.cpp
@@ -24,6 +24,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
 
+#include "ns.h"
+
 #include "compat.h"
 #include "pragmas.h"
 
@@ -31,6 +33,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "interp.h"
 #include "interpso.h"
 
+BEGIN_SW_NS
+
 #define SO_MAXINTERPOLATIONS MAXINTERPOLATIONS
 
 static struct so_interp
@@ -304,13 +308,13 @@ SWBOOL so_writeinterpolations(MFILE_WRITE fil)
 {
     int32_t i;
     SECTOR_OBJECTp sop;
-    const so_interp *interp;
+    so_interp *interp;
     SWBOOL saveisshot = FALSE;
 
     for (sop = SectorObject, interp = so_interpdata;
          sop < &SectorObject[MAX_SECTOR_OBJECTS]; sop++, interp++)
     {
-        const so_interp::interp_data *data = interp->data;
+        so_interp::interp_data *data = interp->data;
         MWRITE(&interp->numinterpolations,sizeof(interp->numinterpolations),1,fil);
         for (i = 0; i < interp->numinterpolations; i++, data++)
         {
@@ -349,3 +353,5 @@ SWBOOL so_readinterpolations(MFILE_READ fil)
     }
     return saveisshot;
 }
+
+END_SW_NS
diff --git a/source/sw/src/interpso.h b/source/sw/src/interpso.h
index a509782f8..cd8f8c423 100644
--- a/source/sw/src/interpso.h
+++ b/source/sw/src/interpso.h
@@ -29,6 +29,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 
 #include "mfile.h"
 
+BEGIN_SW_NS
+
 extern int32_t so_numinterpolations;
 
 void so_addinterpolation(SECTOR_OBJECTp sop);
@@ -42,4 +44,6 @@ void so_restoreinterpolations(void);
 SWBOOL so_writeinterpolations(MFILE_WRITE fil);
 SWBOOL so_readinterpolations(MFILE_READ fil);
 
+END_SW_NS
+
 #endif
diff --git a/source/sw/src/jsector.cpp b/source/sw/src/jsector.cpp
index 860ac1de7..0a5516130 100644
--- a/source/sw/src/jsector.cpp
+++ b/source/sw/src/jsector.cpp
@@ -335,7 +335,7 @@ void JS_InitMirrors(void)
             {
                 if (mirrorcnt >= MAXMIRRORS)
                 {
-                    buildprintf("MAXMIRRORS reached! Skipping mirror wall[%d]\n", i);
+                    Printf("MAXMIRRORS reached! Skipping mirror wall[%d]\n", i);
                     wall[i].overpicnum = sector[s].ceilingpicnum;
                     continue;
                 }
diff --git a/source/sw/src/save.cpp b/source/sw/src/save.cpp
index 116f64dc1..393ddecd7 100644
--- a/source/sw/src/save.cpp
+++ b/source/sw/src/save.cpp
@@ -47,7 +47,6 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "reserve.h"
 
 //#define FILE_TYPE 1
-#include "mfile.h"
 
 #include "weapon.h"
 #include "cache.h"
@@ -1002,7 +1001,7 @@ bool GameInterface::LoadGame(FSaveGameNode* sv)
 
     // SO interpolations
     saveisshot |= so_readinterpolations(fil);
-    if (saveisshot) { MCLOSE_READ(fil); return -1; }
+    if (saveisshot) { MCLOSE_READ(fil); return false; }
 
     // parental lock
     for (i = 0; i < (int)SIZ(otlist); i++)
diff --git a/source/sw/src/saveable.cpp b/source/sw/src/saveable.cpp
index 2a66a89a8..278574c98 100644
--- a/source/sw/src/saveable.cpp
+++ b/source/sw/src/saveable.cpp
@@ -25,6 +25,7 @@
 
 #include "compat.h"
 #include "tarray.h"
+#include "debugbreak.h"
 BEGIN_SW_NS
 
 #include "saveable.h"