From 6aaddf3fa2fac4d5119fa317f8aa33378566a60a Mon Sep 17 00:00:00 2001
From: hendricks266 <hendricks266@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Sun, 15 Oct 2017 23:10:18 +0000
Subject: [PATCH] Enumify the definition of g_gametypeFlags.

git-svn-id: https://svn.eduke32.com/eduke32@6481 1a8010ca-5511-0410-912e-c29ae57300e0
---
 source/duke3d/src/global.cpp  | 45 +++++++++++++++++++++++++++++++----
 source/duke3d/src/osdcmds.cpp |  4 ++--
 source/duke3d/src/screens.cpp |  2 +-
 3 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/source/duke3d/src/global.cpp b/source/duke3d/src/global.cpp
index 4ce29f53c..63c155365 100644
--- a/source/duke3d/src/global.cpp
+++ b/source/duke3d/src/global.cpp
@@ -48,11 +48,46 @@ int32_t g_volumeFlags[MAXVOLUMES];
 
 int32_t g_gametypeFlags[MAXGAMETYPES] =
 {
-    /*4+*/8+16+1024+2048+16384,
-    1+2+32+64+128+256+512+4096+8192+32768,
-    2+/*4+*/8+16+16384,
-    /*4+*/8+16+1024+2048+16384+65536+131072,
-    2+/*4+*/8+16+16384+65536+131072
+    // GAMETYPE_FRAGBAR |
+    GAMETYPE_SCORESHEET |
+    GAMETYPE_DMSWITCHES |
+    GAMETYPE_ITEMRESPAWN |
+    GAMETYPE_MARKEROPTION |
+    GAMETYPE_ACCESSATSTART,
+
+    GAMETYPE_COOP |
+    GAMETYPE_WEAPSTAY |
+    GAMETYPE_COOPSPAWN |
+    GAMETYPE_ACCESSCARDSPRITES |
+    GAMETYPE_COOPVIEW |
+    GAMETYPE_COOPSOUND |
+    GAMETYPE_OTHERPLAYERSINMAP |
+    GAMETYPE_PLAYERSFRIENDLY |
+    GAMETYPE_FIXEDRESPAWN |
+    GAMETYPE_PRESERVEINVENTORYDEATH,
+
+    GAMETYPE_WEAPSTAY |
+    // GAMETYPE_FRAGBAR |
+    GAMETYPE_SCORESHEET |
+    GAMETYPE_DMSWITCHES |
+    GAMETYPE_ACCESSATSTART,
+
+    // GAMETYPE_FRAGBAR |
+    GAMETYPE_SCORESHEET |
+    GAMETYPE_DMSWITCHES |
+    GAMETYPE_ITEMRESPAWN |
+    GAMETYPE_MARKEROPTION |
+    GAMETYPE_ACCESSATSTART |
+    GAMETYPE_TDM |
+    GAMETYPE_TDMSPAWN,
+
+    GAMETYPE_WEAPSTAY |
+    // GAMETYPE_FRAGBAR |
+    GAMETYPE_SCORESHEET |
+    GAMETYPE_DMSWITCHES |
+    GAMETYPE_ACCESSATSTART |
+    GAMETYPE_TDM |
+    GAMETYPE_TDMSPAWN,
 };
 
 int32_t g_actorRespawnTime   = 768;
diff --git a/source/duke3d/src/osdcmds.cpp b/source/duke3d/src/osdcmds.cpp
index 869425e83..1d1b48761 100644
--- a/source/duke3d/src/osdcmds.cpp
+++ b/source/duke3d/src/osdcmds.cpp
@@ -120,7 +120,7 @@ static int32_t osdcmd_changelevel(osdfuncparm_t const * const parm)
 
                 enet_peer_send(g_netClientPeer, CHAN_GAMESTATE, enet_packet_create(tempbuf, 4, ENET_PACKET_FLAG_RELIABLE));
             }
-            if ((GametypeFlags[ud.m_coop] & GAMETYPE_PLAYERSFRIENDLY) && !(GametypeFlags[ud.m_coop] & GAMETYPE_TDM))
+            if ((g_gametypeFlags[ud.m_coop] & GAMETYPE_PLAYERSFRIENDLY) && !(g_gametypeFlags[ud.m_coop] & GAMETYPE_TDM))
                 ud.m_noexits = 0;
 
             M_OpenMenu(myconnectindex);
@@ -257,7 +257,7 @@ static int32_t osdcmd_map(osdfuncparm_t const * const parm)
 
                 enet_peer_send(g_netClientPeer, CHAN_GAMESTATE, enet_packet_create(tempbuf, 4, ENET_PACKET_FLAG_RELIABLE));
             }
-            if ((GametypeFlags[ud.m_coop] & GAMETYPE_PLAYERSFRIENDLY) && !(GametypeFlags[ud.m_coop] & GAMETYPE_TDM))
+            if ((g_gametypeFlags[ud.m_coop] & GAMETYPE_PLAYERSFRIENDLY) && !(g_gametypeFlags[ud.m_coop] & GAMETYPE_TDM))
                 ud.m_noexits = 0;
 
             M_OpenMenu(myconnectindex);
diff --git a/source/duke3d/src/screens.cpp b/source/duke3d/src/screens.cpp
index aaf34f49a..319e7c860 100644
--- a/source/duke3d/src/screens.cpp
+++ b/source/duke3d/src/screens.cpp
@@ -1167,7 +1167,7 @@ void G_DisplayRest(int32_t smoothratio)
         }
     }
 #if 0
-    if (GametypeFlags[ud.coop] & GAMETYPE_TDM)
+    if (g_gametypeFlags[ud.coop] & GAMETYPE_TDM)
     {
         for (i=0; i<ud.multimode; i++)
         {