- include namespace file in all sources as the very first include.

platform/Windows/eduke32.vcxproj

@@ -169,8 +169,6 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="..\..\source\duke3d\src\actors.h" />
-    <ClInclude Include="..\..\source\duke3d\src\android.h" />
-    <ClInclude Include="..\..\source\duke3d\src\in_android.h" />
     <ClInclude Include="..\..\source\duke3d\src\anim.h" />
     <ClInclude Include="..\..\source\duke3d\src\cheats.h" />
     <ClInclude Include="..\..\source\duke3d\src\cmdline.h" />

platform/Windows/eduke32.vcxproj.filters

@@ -7,9 +7,6 @@
     <Filter Include="Header Files">
       <UniqueIdentifier>{82d4000f-cd8c-4737-88dc-4ada5775a68e}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Header Files\android">
-      <UniqueIdentifier>{52ce6149-4982-41a4-9adf-c7a9468421fd}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Resource Files">
       <UniqueIdentifier>{598e3748-14c8-47c3-9bb6-eea06f762413}</UniqueIdentifier>
     </Filter>
@@ -126,12 +123,6 @@
     <ClInclude Include="..\..\source\duke3d\src\common_game.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\duke3d\src\in_android.h">
-      <Filter>Header Files\android</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\duke3d\src\android.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\source\duke3d\src\cheats.h">
       <Filter>Header Files</Filter>
     </ClInclude>

platform/Windows/rednukem.vcxproj

@@ -232,7 +232,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\source\rr\src\gamevars.cpp" />
     <ClCompile Include="..\..\source\rr\src\global.cpp" />
     <ClCompile Include="..\..\source\rr\src\grpscan.cpp" />
     <ClCompile Include="..\..\source\rr\src\input.cpp" />

platform/Windows/rednukem.vcxproj.filters

@@ -173,9 +173,6 @@
     <ClCompile Include="..\..\source\rr\src\gamestructures.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\rr\src\gamevars.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\source\rr\src\global.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>

source/blood/src/actor.cpp

@@ -22,7 +22,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //-------------------------------------------------------------------------
 
 #include <random>
-#include <iostream>
+//#include <iostream>
+
+#include "ns.h"	// Must come before everything else!
+
 
 #include "build.h"
 #include "pragmas.h"

source/blood/src/ai.cpp

@@ -20,6 +20,9 @@ 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"	// Must come before everything else!
+
 #include "build.h"
 #include "pragmas.h"
 #include "mmulti.h"

source/blood/src/aibat.cpp

@@ -20,6 +20,9 @@ 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"	// Must come before everything else!
+
 #include "compat.h"
 #include "build.h"
 #include "pragmas.h"

source/blood/src/aibeast.cpp

@@ -20,6 +20,9 @@ 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"	// Must come before everything else!
+
 #include "compat.h"
 #include "build.h"
 #include "pragmas.h"

source/blood/src/aiboneel.cpp

@@ -20,6 +20,9 @@ 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"	// Must come before everything else!
+
 #include "build.h"
 #include "pragmas.h"
 #include "mmulti.h"

source/blood/src/aiburn.cpp

@@ -20,6 +20,9 @@ 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"	// Must come before everything else!
+
 #include "compat.h"
 #include "build.h"
 #include "pragmas.h"

source/blood/src/aicaleb.cpp

@@ -20,6 +20,9 @@ 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"	// Must come before everything else!
+
 #include "compat.h"
 #include "build.h"
 #include "pragmas.h"

source/blood/src/aicerber.cpp

@@ -20,6 +20,9 @@ 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"	// Must come before everything else!
+
 #include "compat.h"
 #include "build.h"
 #include "pragmas.h"

source/blood/src/aicult.cpp

@@ -20,6 +20,9 @@ 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"	// Must come before everything else!
+
 #include "compat.h"
 #include "build.h"
 #include "pragmas.h"

source/blood/src/aigarg.cpp

@@ -20,6 +20,9 @@ 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"	// Must come before everything else!
+
 #include "compat.h"
 #include "build.h"
 #include "pragmas.h"

source/blood/src/aighost.cpp

@@ -20,6 +20,9 @@ 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"	// Must come before everything else!
+
 #include "compat.h"
 #include "build.h"
 #include "pragmas.h"

source/blood/src/aigilbst.cpp

@@ -20,6 +20,9 @@ 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"	// Must come before everything else!
+
 #include "compat.h"
 #include "build.h"
 #include "pragmas.h"

source/blood/src/aihand.cpp

@@ -20,6 +20,9 @@ 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"	// Must come before everything else!
+
 #include "compat.h"
 #include "build.h"
 #include "pragmas.h"

source/blood/src/aihound.cpp

@@ -20,6 +20,9 @@ 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"	// Must come before everything else!
+
 #include "compat.h"
 #include "build.h"
 #include "pragmas.h"

source/blood/src/aiinnoc.cpp

@@ -20,6 +20,9 @@ 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"	// Must come before everything else!
+
 #include "compat.h"
 #include "build.h"
 #include "pragmas.h"

source/blood/src/aipod.cpp

@@ -20,6 +20,9 @@ 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"	// Must come before everything else!
+
 #include "compat.h"
 #include "build.h"
 #include "pragmas.h"

source/blood/src/airat.cpp

@@ -20,6 +20,9 @@ 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"	// Must come before everything else!
+
 #include "compat.h"
 #include "build.h"
 #include "pragmas.h"

source/blood/src/aispid.cpp

@@ -20,6 +20,9 @@ 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"	// Must come before everything else!
+
 #include "compat.h"
 #include "build.h"
 #include "pragmas.h"

source/blood/src/aitchern.cpp

@@ -20,6 +20,9 @@ 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"	// Must come before everything else!
+
 #include "compat.h"
 #include "build.h"
 #include "pragmas.h"

source/blood/src/aiunicult.cpp

@@ -21,6 +21,9 @@ 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"	// Must come before everything else!
+
 #include "compat.h"
 #include "build.h"
 #include "pragmas.h"

source/blood/src/aizomba.cpp

@@ -20,6 +20,9 @@ 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"	// Must come before everything else!
+
 #include "compat.h"
 #include "build.h"
 #include "pragmas.h"

source/blood/src/aizombf.cpp

@@ -20,6 +20,9 @@ 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"	// Must come before everything else!
+
 #include "compat.h"
 #include "build.h"
 #include "pragmas.h"

source/blood/src/asound.cpp

@@ -20,6 +20,9 @@ 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"	// Must come before everything else!
+
 #include "build.h"
 #include "fx_man.h"
 #include "common_game.h"

source/blood/src/barf.cpp

@@ -21,6 +21,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 //-------------------------------------------------------------------------
 
+#include "ns.h"	// Must come before everything else!
+
 #include "compat.h"
 #ifdef WITHKPLIB
 #include "kplib.h"

source/blood/src/blood.cpp

@@ -20,6 +20,9 @@ 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"	// Must come before everything else!
+
 #include "build.h"
 #include "mmulti.h"
 #include "compat.h"

source/blood/src/callback.cpp

@@ -21,6 +21,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 //-------------------------------------------------------------------------
 
+#include "ns.h"	// Must come before everything else!
+
 #include "build.h"
 #include "common_game.h"
 

source/blood/src/choke.cpp

@@ -20,6 +20,9 @@ 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"	// Must come before everything else!
+
 #include "build.h"
 #include "compat.h"
 #include "common_game.h"

source/blood/src/common.cpp

@@ -25,6 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 // Common non-engine code/data for EDuke32 and Mapster32
 //
 
+#include "ns.h"	// Must come before everything else!
+
 #include "compat.h"
 #include "build.h"
 #include "baselayer.h"

source/blood/src/config.cpp

@@ -21,6 +21,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 //-------------------------------------------------------------------------
 
+#include "ns.h"	// Must come before everything else!
+
+
 #include "baselayer.h"
 #include "common_game.h"
 #include "build.h"

source/blood/src/controls.cpp

@@ -20,6 +20,9 @@ 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"	// Must come before everything else!
+
 #include "compat.h"
 #include "baselayer.h"
 #include "keyboard.h"

source/blood/src/credits.cpp

@@ -20,6 +20,9 @@ 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"	// Must come before everything else!
+
 #include "build.h"
 #include "compat.h"
 #include "SmackerDecoder.h"

source/blood/src/db.cpp

@@ -20,10 +20,10 @@ 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"	// Must come before everything else!
+
 #include "build.h"
-#ifdef POLYMER
-#include "polymer.h"
-#endif
 #include "compat.h"
 #include "common_game.h"
 #include "crc32.h"

source/blood/src/demo.cpp

@@ -20,6 +20,9 @@ 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"	// Must come before everything else!
+
 #include <stdio.h>
 #include <string.h>
 #include "common.h"

source/blood/src/dude.cpp

@@ -20,6 +20,9 @@ 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"	// Must come before everything else!
+
 #include "compat.h"
 #include "common.h"
 #include "blood.h"

source/blood/src/endgame.cpp

@@ -20,6 +20,9 @@ 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"	// Must come before everything else!
+
 #include "build.h"
 #include "common.h"
 #include "mmulti.h"

source/blood/src/eventq.cpp

@@ -20,6 +20,9 @@ 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"	// Must come before everything else!
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

source/blood/src/fire.cpp

@@ -20,6 +20,9 @@ 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"	// Must come before everything else!
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

source/blood/src/fx.cpp

@@ -21,6 +21,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 //-------------------------------------------------------------------------
 
+#include "ns.h"	// Must come before everything else!
+
 #include "build.h"
 #include "common_game.h"
 

source/blood/src/gamemenu.cpp

@@ -20,6 +20,9 @@ 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"	// Must come before everything else!
+
 #include "build.h"
 #include "compat.h"
 #include "mouse.h"

source/blood/src/gameutil.cpp

@@ -20,6 +20,9 @@ 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"	// Must come before everything else!
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

source/blood/src/getopt.cpp

@@ -20,6 +20,9 @@ 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"	// Must come before everything else!
+
 #include <stdlib.h>
 #include <string.h>
 #include "compat.h"

source/blood/src/gib.cpp

@@ -20,6 +20,9 @@ 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"	// Must come before everything else!
+
 #include "compat.h"
 #include "build.h"
 #include "pragmas.h"

source/blood/src/globals.cpp

@@ -20,6 +20,9 @@ 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"	// Must come before everything else!
+
 #include <stdlib.h>
 
 #include "compat.h"

source/blood/src/inifile.cpp

@@ -22,6 +22,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //-------------------------------------------------------------------------
 // Note: This module is based on the sirlemonhead's work
 
+#include "ns.h"	// Must come before everything else!
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>

source/blood/src/iob.cpp

@@ -20,6 +20,8 @@ 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"	// Must come before everything else!
+
 #include <stdlib.h>
 #include <string.h>
 #include "compat.h"

source/blood/src/levels.cpp

@@ -20,6 +20,8 @@ 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"	// Must come before everything else!
+
 #include <stdlib.h>
 #include <string.h>
 #include "compat.h"

source/blood/src/loadsave.cpp

@@ -20,6 +20,8 @@ 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"	// Must come before everything else!
+
 #include <stdio.h>
 #include "build.h"
 #include "compat.h"

source/blood/src/map2d.cpp

@@ -20,6 +20,8 @@ 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"	// Must come before everything else!
+
 #include "build.h"
 #include "mmulti.h"
 #include "common_game.h"

source/blood/src/menu.cpp

@@ -20,6 +20,8 @@ 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"	// Must come before everything else!
+
 #include "compat.h"
 #include "mmulti.h"
 #include "common_game.h"

source/blood/src/messages.cpp

@@ -20,6 +20,8 @@ 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"	// Must come before everything else!
+
 #include "build.h"
 #include "mmulti.h"
 #include "compat.h"

source/blood/src/mirrors.cpp

@@ -20,11 +20,10 @@ 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"	// Must come before everything else!
+
 #include "build.h"
 #include "compat.h"
-#ifdef POLYMER
-#include "polymer.h"
-#endif
 #include "common_game.h"
 #include "blood.h"
 #include "db.h"

source/blood/src/misc.cpp

@@ -20,6 +20,8 @@ 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"	// Must come before everything else!
+
 #include <stdio.h>
 #include <string.h>
 #include "common_game.h"

source/blood/src/network.cpp

@@ -20,6 +20,8 @@ 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"	// Must come before everything else!
+
 #include "build.h"
 #include "mmulti.h"
 #include "pragmas.h"

source/blood/src/osdcmd.cpp

@@ -20,6 +20,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"	// Must come before everything else!
 
 #include "build.h"
 #include "baselayer.h"

source/blood/src/player.cpp

@@ -20,6 +20,8 @@ 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"	// Must come before everything else!
+
 #include <stdlib.h>
 #include <string.h>
 #include "compat.h"

source/blood/src/qav.cpp

@@ -20,6 +20,8 @@ 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"	// Must come before everything else!
+
 #include "build.h"
 #include "compat.h"
 #include "common_game.h"

source/blood/src/qheap.cpp

@@ -20,6 +20,8 @@ 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"	// Must come before everything else!
+
 #ifdef USE_QHEAP
 
 #include <stdio.h>

source/blood/src/replace.cpp

@@ -20,6 +20,8 @@ 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"	// Must come before everything else!
+
 #include "compat.h"
 #include "common_game.h"
 #include "crc32.h"

source/blood/src/resource.cpp

@@ -20,6 +20,8 @@ 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"	// Must come before everything else!
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

source/blood/src/screen.cpp

@@ -20,6 +20,8 @@ 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"	// Must come before everything else!
+
 #include <string.h>
 #include "a.h"
 #include "build.h"

source/blood/src/sectorfx.cpp

@@ -20,6 +20,8 @@ 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"	// Must come before everything else!
+
 #include "compat.h"
 #include "build.h"
 #include "pragmas.h"

source/blood/src/seq.cpp

@@ -20,6 +20,8 @@ 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"	// Must come before everything else!
+
 #include <string.h>
 #include "build.h"
 #include "common_game.h"

source/blood/src/sfx.cpp

@@ -20,6 +20,8 @@ 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"	// Must come before everything else!
+
 #include <string.h>
 #include "build.h"
 #include "compat.h"

source/blood/src/sound.cpp

@@ -20,6 +20,8 @@ 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"	// Must come before everything else!
+
 #include "build.h"
 #include "compat.h"
 #include "music.h"

source/blood/src/startgtk.game.cpp

@@ -19,6 +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"	// Must come before everything else!
 
 #include "build.h"
 #include "common.h"

source/blood/src/startosx.game.mm

@@ -5,6 +5,8 @@
 
 #undef Rect
 
+#include "ns.h"	// Must come before everything else!
+
 #include "blood.h"
 #include "common.h"
 #include "common_game.h"

source/blood/src/startwin.game.cpp

@@ -21,6 +21,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 //-------------------------------------------------------------------------
 
+#include "ns.h"	// Must come before everything else!
+
 #ifndef _WIN32
 #error Only for Windows
 #endif

source/blood/src/tile.cpp

@@ -20,6 +20,8 @@ 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"	// Must come before everything else!
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

source/blood/src/trig.cpp

@@ -1,3 +1,5 @@
+#include "ns.h"	// Must come before everything else!
+
 #include "build.h"
 #include "pragmas.h"
 #include "common_game.h"

source/blood/src/triggers.cpp

@@ -20,8 +20,9 @@ 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"	// Must come before everything else!
+
 #include <random>
-#include <iostream>
 
 #include "build.h"
 #include "compat.h"

source/blood/src/view.cpp

@@ -20,6 +20,8 @@ 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"	// Must come before everything else!
+
 #include <stdlib.h>
 #include <string.h>
 

source/blood/src/warp.cpp

@@ -20,6 +20,8 @@ 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"	// Must come before everything else!
+
 #include "build.h"
 #include "compat.h"
 #include "common_game.h"

source/blood/src/weapon.cpp

@@ -20,6 +20,8 @@ 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"	// Must come before everything else!
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

source/blood/src/winbits.cpp

@@ -21,6 +21,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 //-------------------------------------------------------------------------
 
+#include "ns.h"	// Must come before everything else!
+
 #ifdef _WIN32
 
 #include "compat.h"

source/build/include/ns.h

@@ -0,0 +1,31 @@
+#pragma once
+
+#ifndef NO_NAMESPACE
+
+#define BEGIN_DUKE_NS namespace Duke {
+#define END_DUKE_NS }
+
+#define BEGIN_RR_NS namespace Redneck {
+#define END_RR_NS }
+
+#define BEGIN_BLD_NS namespace Blood {
+#define END_BLD_NS }
+
+#define BEGIN_SW_NS namespace Blood {
+#define END_SW_NS }
+
+#else
+	
+#define BEGIN_DUKE_NS
+#define END_DUKE_NS
+
+#define BEGIN_RR_NS
+#define END_RR_NS
+
+#define BEGIN_BLD_NS
+#define END_BLD_NS
+
+#define BEGIN_SW_NS
+#define END_SW_NS
+
+#endif

source/duke3d/src/GameListSource.game.mm

@@ -9,6 +9,8 @@
 
 #import <Foundation/Foundation.h>
 
+#include "ns.h"	// Must come before everything else!
+
 #include "compat.h"
 
 #import "GrpFile.game.h"

source/duke3d/src/GrpFile.game.mm

@@ -6,6 +6,7 @@
  *  Copyright 2009 __MyCompanyName__. All rights reserved.
  *
  */
+#include "ns.h"	// Must come before everything else!
 
 #include "GrpFile.game.h"
 

source/duke3d/src/actors.cpp

@@ -20,6 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 //-------------------------------------------------------------------------
 
+#include "ns.h"	// Must come before everything else!
+
 #define actors_c_
 
 #include "duke3d.h"

source/duke3d/src/anim.cpp

@@ -20,6 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 //-------------------------------------------------------------------------
 
+#include "ns.h"	// Must come before everything else!
+
 #include "baselayer.h"
 #include "renderlayer.h"
 #include "duke3d.h"

source/duke3d/src/cheats.cpp

@@ -20,6 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 //-------------------------------------------------------------------------
 
+#include "ns.h"	// Must come before everything else!
+
 #include "duke3d.h"
 #include "osdcmds.h"
 #include "cheats.h"

source/duke3d/src/cmdline.cpp

@@ -20,6 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 //-------------------------------------------------------------------------
 
+#include "ns.h"	// Must come before everything else!
+
 #include "duke3d.h"
 #include "demo.h"
 #include "screens.h"

source/duke3d/src/common.cpp

@@ -2,6 +2,8 @@
 // Common non-engine code/data for EDuke32 and Mapster32
 //
 
+#include "ns.h"	// Must come before everything else!
+
 #include "compat.h"
 #include "build.h"
 #include "baselayer.h"

source/duke3d/src/config.cpp

@@ -20,6 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 //-------------------------------------------------------------------------
 
+#include "ns.h"	// Must come before everything else!
+
 #include "duke3d.h"
 #include "scriplib.h"
 #include "osdcmds.h"

source/duke3d/src/demo.cpp

@@ -20,6 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 //-------------------------------------------------------------------------
 
+#include "ns.h"	// Must come before everything else!
+
 #include "demo.h"
 #include "duke3d.h"
 #include "input.h"

source/duke3d/src/game.cpp

@@ -20,6 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 //-------------------------------------------------------------------------
 
+#include "ns.h"	// Must come before everything else!
+
 #define game_c_
 
 #include "duke3d.h"

source/duke3d/src/gamedef.cpp

@@ -20,6 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 //-------------------------------------------------------------------------
 
+#include "ns.h"	// Must come before everything else!
+
 #include "gamedef.h"
 
 #include "cheats.h"

source/duke3d/src/gameexec.cpp

@@ -20,6 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 //-------------------------------------------------------------------------
 
+#include "ns.h"	// Must come before everything else!
+
 #include "anim.h"
 #include "cmdline.h"
 #include "colmatch.h"

source/duke3d/src/gamevars.cpp

@@ -20,6 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 //-------------------------------------------------------------------------
 
+#include "ns.h"	// Must come before everything else!
+
 #include "duke3d.h"
 #include "menus.h"
 #include "savegame.h"

source/duke3d/src/global.cpp

@@ -20,6 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 //-------------------------------------------------------------------------
 
+#include "ns.h"	// Must come before everything else!
+
 #define global_c_
 #include "global.h"
 #include "duke3d.h"

source/duke3d/src/grpscan.cpp

@@ -20,6 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 //-------------------------------------------------------------------------
 
+#include "ns.h"	// Must come before everything else!
+
 #include "baselayer.h"
 #include "cache1d.h"
 #include "common_game.h"

source/duke3d/src/in_android.cpp

@@ -1,354 +0,0 @@
-//-------------------------------------------------------------------------
-/*
-Copyright (C) 2015 EDuke32 developers and contributors
-Copyright (C) 2015 Voidpoint, LLC
-
-This file is part of EDuke32.
-
-EDuke32 is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License version 2
-as published by the Free Software Foundation.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-*/
-//-------------------------------------------------------------------------
-
-#include "compat.h"
-#include "sdl_inc.h"
-#include "baselayer.h"
-#include "keys.h"
-#include "duke3d.h"
-#include "common_game.h"
-#include "osd.h"
-#include "player.h"
-#include "game.h"
-#include "build.h"
-#include "anim.h"
-#include "player.h"
-
-#include "keyboard.h"
-#include "control.h"
-#include "_control.h"
-
-#include "menus.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-extern int SDL_SendKeyboardKey(Uint8 state, SDL_Scancode scancode);
-extern int SDL_SendKeyboardText(const char *text);
-extern int SDL_SendMouseMotion(SDL_Window * window, Uint32 mouseID, int relative, int x, int y);
-extern int SDL_SendMouseButton(SDL_Window * window, Uint32 mouseID, Uint8 state, Uint8 button);
-
-#ifdef __cplusplus
-}
-#endif
-
-#include "in_android.h"
-#include <android/log.h>
-
-#if defined __GNUC__
-# pragma GCC diagnostic push
-# pragma GCC diagnostic ignored "-Wunused-parameter"
-#endif
-
-#define LOGI(...) ((void)__android_log_print(ANDROID_LOG_INFO,"DUKE", __VA_ARGS__))
-
-static char sdl_text[2];
-
-droidinput_t droidinput;
-
-void AndroidTimer(int tics) { G_InitTimer(tics);  }
-
-int AndroidKeyEvent(int state, int code,int unicode)
-{
-    LOGI("AndroidKeyEvent %d %d %d",state,(SDL_Scancode)code,unicode);
-    SDL_SendKeyboardKey(state ? SDL_PRESSED : SDL_RELEASED, (SDL_Scancode)code);
-    SDL_EventState(SDL_TEXTINPUT, SDL_ENABLE);
-
-    // if (code == 42)
-    //    unicode = 42;
-
-    if (state)
-    {
-        //if (unicode < 128)
-        {
-            sdl_text[0] = unicode;
-            sdl_text[1] = 0;
-
-            int posted = SDL_SendKeyboardText((const char*)sdl_text);
-            LOGI("posted = %d",posted);
-        }
-
-        if (state == 2)
-            AndroidKeyEvent(0, code, unicode);
-    }
-
-    return 0;
-}
-
-void AndroidMouseMenu(float x,float y)
-{
-    SDL_SendMouseMotion(NULL,0,0,x,y);
-}
-
-void AndroidMouseMenuButton(int state,int button)
-{
-    SDL_SendMouseButton(NULL, SDL_TOUCH_MOUSEID, state?SDL_PRESSED:SDL_RELEASED, SDL_BUTTON_LEFT);
-}
-
-void changeActionState(int state, int action)
-{
-    if (state)
-    {
-        //BUTTONSET(action,1);
-        droidinput.functionSticky  |= ((uint64_t)1<<((uint64_t)(action)));
-        droidinput.functionHeld    |= ((uint64_t)1<<((uint64_t)(action)));
-        return;
-    }
-
-    //BUTTONCLEAR(action);
-    droidinput.functionHeld  &= ~((uint64_t) 1<<((uint64_t) (action)));
-}
-
-void AndroidAction(int state, int action)
-{
-    LOGI("AndroidAction action = %d, state = %d", action, state);
-
-    if (action >= MENU_UP && action <= MENU_BACK)
-    {
-        int const sdl_code [] = { SDL_SCANCODE_UP, SDL_SCANCODE_DOWN, SDL_SCANCODE_LEFT,
-                SDL_SCANCODE_RIGHT, SDL_SCANCODE_RETURN, SDL_SCANCODE_ESCAPE };
-        AndroidKeyEvent(state, sdl_code[action-MENU_UP], 0);
-        return;
-    }
-    else
-    {
-        //if (AndroidRead(READ_SCREEN_MODE) != TOUCH_SCREEN_GAME) //If not in game don't do any of this
-        ///     return;
-
-        //Special toggle for crouch, NOT when using jetpack or in water
-        if (droidinput.toggleCrouch)
-        {
-            int lotag = sector[g_player[myconnectindex].ps->cursectnum].lotag;
-
-            if (droidinput.crouchToggleState && (lotag == ST_2_UNDERWATER || lotag == ST_1_ABOVE_WATER))
-            {
-                droidinput.crouchToggleState = 0;
-                if (action == gamefunc_Crouch)
-                    state = 0;
-                else AndroidAction(0, gamefunc_Crouch);
-            }
-
-            if (action == gamefunc_Crouch)
-            {
-                if (!g_player[myconnectindex].ps->jetpack_on && g_player[myconnectindex].ps->on_ground &&
-                    lotag != ST_2_UNDERWATER && lotag != ST_1_ABOVE_WATER)
-                {
-                    if (state)
-                        droidinput.crouchToggleState = !droidinput.crouchToggleState;
-
-                    state = droidinput.crouchToggleState;
-                }
-            }
-
-        }
-
-        //Check if jumping while crouched
-        if (action == gamefunc_Jump)
-        {
-            if (droidinput.crouchToggleState)
-            {
-                droidinput.crouchToggleState = 0;
-                changeActionState(0, gamefunc_Crouch);
-            }
-            else
-                changeActionState(state, action);
-        }
-        else
-            changeActionState(state, action);
-
-        if (state == 2)
-            AndroidAction(0, action);
-
-        // LOGI("AndroidAction state = 0x%016llX", CONTROL_ButtonState);
-    }
-}
-
-int const deadRegion = 0.3;
-
-float analogCalibrate(float v)
-{
-    float rv = 0;
-
-    if (v > deadRegion) rv = (v - deadRegion) * (v - deadRegion);
-    else if (-v > deadRegion) rv = -(-v - deadRegion) * (-v - deadRegion);
-
-    return rv;
-}
-
-//Need these NAN check as not cumulative.
-void AndroidMove(float fwd, float strafe)
-{
-    if (!ud.auto_run)
-    {
-        fwd *= 0.5f;
-        strafe *= 0.5f;
-    }
-
-    if (!isnan(fwd))
-        droidinput.forwardmove = fclamp2(analogCalibrate(fwd), -1.f, 1.f);
-
-    if (!isnan(strafe))
-        droidinput.sidemove    = fclamp2(analogCalibrate(strafe),    -1.f, 1.f);
-}
-
-void AndroidLook(float yaw, float pitch)
-{
-    droidinput.pitch += pitch;
-    droidinput.yaw   += yaw;
-}
-
-void AndroidLookJoystick(float yaw, float pitch)
-{
-    if (!isnan(pitch))
-        droidinput.pitch_joystick = analogCalibrate(pitch);
-
-    if (!isnan(yaw))
-        droidinput.yaw_joystick   = analogCalibrate(yaw);
-}
-
-void AndroidOSD(const char * cmd)
-{
-    OSD_Dispatch(cmd);
-}
-
-int consoleShown = 0;
-void AndroidSetConsoleShown(int onf)
-{
-    consoleShown = onf;
-}
-
-extern int inExtraScreens; //In game.c
-int32_t AndroidRead(portableread_t r)
-{
-    int32_t rv;
-
-    switch (r)
-    {
-    case R_TOUCH_MODE:
-        if (g_animPtr || inExtraScreens)
-            rv = TOUCH_SCREEN_BLANK_TAP;
-        else if (consoleShown)
-            rv = TOUCH_SCREEN_CONSOLE;
-        else if ((g_player[myconnectindex].ps->gm & MODE_MENU) == MODE_MENU && g_currentMenu != MENU_MAIN)
-            rv = (m_currentMenu->type == Verify && totalclock > (m_animation.length + m_animation.start)) ? TOUCH_SCREEN_YES_NO : TOUCH_SCREEN_MENU;
-        else if ((g_player[myconnectindex].ps->gm & MODE_MENU) == MODE_MENU && g_currentMenu == MENU_MAIN)
-            rv = TOUCH_SCREEN_MENU_NOBACK;
-/*
-        else if (ud.overhead_on == 2)
-            rv = TOUCH_SCREEN_AUTOMAP;
-*/
-        else if ((g_player[myconnectindex].ps->gm & MODE_GAME))
-            if (AndroidRead(R_PLAYER_DEAD_FLAG))
-                rv = TOUCH_SCREEN_BLANK_TAP;
-            else
-                rv = TOUCH_SCREEN_GAME;
-        else
-            rv = TOUCH_SCREEN_BLANK_TAP;
-         break;
-    case R_PLAYER_GOTWEAPON:
-        rv = g_player[myconnectindex].ps->gotweapon; break;
-    case R_UD_OVERHEAD_ON:
-        rv = 0; break;//ud.overhead_on != 0;  break;// ud.overhead_on ranges from 0-2
-    case R_UD_SCROLLMODE:
-        rv = ud.scrollmode; break;
-    case R_PLAYER_LASTWEAPON:
-        rv = droidinput.lastWeapon;
-        if ((unsigned)rv < MAX_WEAPONS && !g_player[myconnectindex].ps->ammo_amount[rv])
-            rv = -1;
-        break;
-    case R_GAME_PAUSED:
-        rv = ud.pause_on != 0; break;
-    case R_PLAYER_DEAD_FLAG:
-        rv = g_player[myconnectindex].ps->dead_flag; break;
-    case R_PLAYER_INV_AMOUNT:
-        rv = 0;
-        for (bssize_t i = 0; i < GET_MAX; i++)
-        {
-            if (g_player[myconnectindex].ps->inv_amount[i])
-                rv += (1 << i);
-        }
-        break;
-    case R_SOMETHINGONPLAYER:
-        rv = g_player[myconnectindex].ps->somethingonplayer != -1;
-        break;
-    default:
-        rv = 0; break;
-    }
-
-    return rv;
-}
-
-static float map_zoom,map_dx,map_dy = 0;
-
-void AndroidAutomapControl(float zoom,float dx,float dy)
-{
-    map_zoom += zoom;
-    map_dx += dx;
-    map_dy += dy;
-}
-
-///This stuff is called from the game/engine
-
-extern void  CONTROL_Android_ScrollMap(int32_t *angle,int32_t *x, int32_t *y, uint16_t *zoom )
-{
-
-    *x += ((int)(map_dx * -30000)*sintable[(512+2048-*angle)&2047])>>14;
-    *y += ((int)(map_dy * -30000)*sintable[(512+1024-512-*angle)&2047])>>14;
-
-//    *zoom += map_zoom * 2000;
-    //*angle = 0;
-    map_dx = map_dy = map_zoom = 0;
-}
-
-void CONTROL_Android_SetLastWeapon(int w)
-{
-    droidinput.lastWeapon = w;
-}
-
-void CONTROL_Android_ClearButton(int32_t whichbutton)
-{
-    droidinput.functionHeld  &= ~((uint64_t)1<<((uint64_t)(whichbutton)));
-}
-
-void CONTROL_Android_PollDevices(ControlInfo *info)
-{
-    //LOGI("CONTROL_Android_PollDevices %f %f",forwardmove,sidemove);
-    //LOGI("CONTROL_Android_PollDevices %f %f",droidinput.pitch,droidinput.yaw);
-
-    info->dz = (int32_t)nearbyintf(-droidinput.forwardmove * ANDROIDMOVEFACTOR);
-    info->dx = (int32_t)nearbyintf(droidinput.sidemove * ANDROIDMOVEFACTOR) >> 5;
-    info->dpitch =
-    (int32_t)nearbyintf(droidinput.pitch * ANDROIDLOOKFACTOR + droidinput.pitch_joystick * ANDROIDPITCHFACTORJOYSTICK);
-    info->dyaw =
-    (int32_t)nearbyintf(-droidinput.yaw * ANDROIDLOOKFACTOR - droidinput.yaw_joystick * ANDROIDYAWFACTORJOYSTICK);
-
-    droidinput.pitch = droidinput.yaw = 0.f;
-    CONTROL_ButtonState = droidinput.functionSticky | droidinput.functionHeld;
-    droidinput.functionSticky = 0;
-
-    //LOGI("poll state = 0x%016llX",CONTROL_ButtonState);
-}
-
-#if defined __GNUC__
-# pragma GCC diagnostic pop
-#endif

source/duke3d/src/input.cpp

@@ -20,6 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 //-------------------------------------------------------------------------
 
+#include "ns.h"	// Must come before everything else!
+
 #include "global.h"
 #include "game.h"
 #include "function.h"

source/duke3d/src/mdump.cpp

@@ -1,3 +1,4 @@
+#include "ns.h"	// Must come before everything else!
 
 #include "compat.h"
 #include "mdump.h"

source/duke3d/src/menus.cpp

@@ -20,6 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 //-------------------------------------------------------------------------
 
+#include "ns.h"	// Must come before everything else!
+
 #include "cheats.h"
 #include "compat.h"
 #include "demo.h"

source/duke3d/src/namesdyn.cpp

@@ -20,6 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 //-------------------------------------------------------------------------
 
+#include "ns.h"	// Must come before everything else!
+
 #include "compat.h"
 #include "build.h"
 

source/duke3d/src/network.cpp

@@ -20,6 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 //-------------------------------------------------------------------------
 
+#include "ns.h"	// Must come before everything else!
+
 /// Preprocessor directives:
 ///
 /// ITERATE_ON_UPDATE:  Every time the netcode updates the sprite linked lists, attempt to iterate through all of them.