From fca147c83b9fefd6bc58ebde7eafc4b61b9e2cdd Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Fri, 20 Mar 2020 21:26:28 +0100
Subject: [PATCH] - fixed compilation.

---
 source/CMakeLists.txt                | 1 -
 source/duke3d/CMakeLists.txt         | 5 +----
 source/duke3d/src/gameexec.cpp       | 2 --
 source/duke3d/src/gamestructures.cpp | 7 +++++--
 source/duke3d/src/gamestructures.h   | 9 +++------
 source/duke3d/src/gamevars.cpp       | 2 +-
 6 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index 23eaa330f..083e8a462 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -654,7 +654,6 @@ set (PCH_SOURCES
 
 	thirdparty/src/base64.cpp
 	thirdparty/src/fix16.cpp
-	thirdparty/src/fix16_str.cpp
 	thirdparty/src/md4.cpp
 	thirdparty/src/enet.cpp
 	#thirdparty/imgui/imgui.cpp
diff --git a/source/duke3d/CMakeLists.txt b/source/duke3d/CMakeLists.txt
index cb852ddc7..7b3f2cbce 100644
--- a/source/duke3d/CMakeLists.txt
+++ b/source/duke3d/CMakeLists.txt
@@ -1,8 +1,4 @@
 
-set( NOT_COMPILED_SOURCE_FILES
-	src/gamestructures.cpp
-)
-
 set( PCH_SOURCES
 	src/actors.cpp
 	src/anim.cpp
@@ -14,6 +10,7 @@ set( PCH_SOURCES
 	src/game.cpp
 	src/gamedef.cpp
 	src/gameexec.cpp
+	src/gamestructures.cpp
 	src/gamevars.cpp
 	src/global.cpp
 	src/namesdyn.cpp
diff --git a/source/duke3d/src/gameexec.cpp b/source/duke3d/src/gameexec.cpp
index ab1eaba55..2ac0eebe4 100644
--- a/source/duke3d/src/gameexec.cpp
+++ b/source/duke3d/src/gameexec.cpp
@@ -25,11 +25,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "anim.h"
 #include "cmdline.h"
 #include "imagehelpers.h"
-#include "communityapi.h"
 #include "compat.h"
 #include "duke3d.h"
 #include "gamestructures.h"
-#include "input.h"
 #include "menus.h"
 #include "osdcmds.h"
 #include "savegame.h"
diff --git a/source/duke3d/src/gamestructures.cpp b/source/duke3d/src/gamestructures.cpp
index 0fb408de7..6613a0c5e 100644
--- a/source/duke3d/src/gamestructures.cpp
+++ b/source/duke3d/src/gamestructures.cpp
@@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 //-------------------------------------------------------------------------
-
+#include "ns.h"
 #include "gamestructures.h"
 
 #include "compat.h"
@@ -28,6 +28,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "gameexec.h"
 #include "global.h"
 
+BEGIN_DUKE_NS
+
 #define LABEL_SETUP_UNMATCHED(struct, memb, name, idx)                                                              \
     {                                                                                                               \
         name, idx, sizeof(struct[0].memb) | (is_unsigned<decltype(struct[0].memb)>::value ? LABEL_UNSIGNED : 0), 0, \
@@ -1949,5 +1951,6 @@ void VM_InitHashTables(void)
     STRUCT_HASH_SETUP(h_userdef,    UserdefsLabels);
     STRUCT_HASH_SETUP(h_wall,       WallLabels);
 }
-#undef STRUCT_HASH_SETUP
+//#undef STRUCT_HASH_SETUP
 
+END_DUKE_NS
diff --git a/source/duke3d/src/gamestructures.h b/source/duke3d/src/gamestructures.h
index d411e599b..b5bce04b7 100644
--- a/source/duke3d/src/gamestructures.h
+++ b/source/duke3d/src/gamestructures.h
@@ -27,9 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "compat.h"
 #include "hash.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+BEGIN_DUKE_NS
 
 int32_t __fastcall VM_GetUserdef(int32_t labelNum, int const lParm2);
 void    __fastcall VM_SetUserdef(int const labelNum, int const lParm2, int32_t const newValue);
@@ -87,8 +85,7 @@ static hashtable_t *const vmStructHashTablePtrs[] = {
     &h_actor, &h_input, &h_paldata, &h_player, &h_projectile, &h_sector, &h_tiledata, &h_tsprite, &h_userdef, &h_wall,
 };
 
-#ifdef __cplusplus
-}
-#endif
+END_DUKE_NS
+
 
 #endif // gamestructures_h__
\ No newline at end of file
diff --git a/source/duke3d/src/gamevars.cpp b/source/duke3d/src/gamevars.cpp
index 6a0c7d069..d3f459efb 100644
--- a/source/duke3d/src/gamevars.cpp
+++ b/source/duke3d/src/gamevars.cpp
@@ -27,9 +27,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "savegame.h"
 #include "gamecvars.h"
 #include "menu/menu.h"
+#include "gamestructures.h"
 
 BEGIN_DUKE_NS
-#include "gamestructures.h"
 
 #ifdef LUNATIC
 int32_t g_noResetVars;