From 47d3f07ccfa7953e7c3ce16e7e12d6954c25115b Mon Sep 17 00:00:00 2001
From: hendricks266 <hendricks266@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Tue, 2 Dec 2014 06:15:49 +0000
Subject: [PATCH] Remove the structure fields in grpscan.c that blocked my code
 for allowing NAM, NAPALM, and WWII GI to fall back to GAME.CON.

git-svn-id: https://svn.eduke32.com/eduke32@4789 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/source/common.c      | 8 ++++----
 polymer/eduke32/source/common_game.h | 5 -----
 polymer/eduke32/source/grpscan.c     | 8 ++++----
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/polymer/eduke32/source/common.c b/polymer/eduke32/source/common.c
index 2a7c0bae4..7d92b3a7b 100644
--- a/polymer/eduke32/source/common.c
+++ b/polymer/eduke32/source/common.c
@@ -31,10 +31,10 @@ const char *g_gameNamePtr = NULL;
 
 // grp/con handling
 
-const char *defaultgamegrp[GAMECOUNT] = { "DUKE3D.GRP", "NAM.GRP", "NAPALM.GRP", "WW2GI.GRP" };
-const char *defaultdeffilename[GAMECOUNT] = { "duke3d.def", "nam.def", "napalm.def", "ww2gi.def" };
-const char *defaultconfilename = "GAME.CON";
-const char *defaultgameconfilename[GAMECOUNT] = { "EDUKE.CON", "NAM.CON", "NAPALM.CON", "WW2GI.CON" };
+static const char *defaultgamegrp[GAMECOUNT] = { "DUKE3D.GRP", "NAM.GRP", "NAPALM.GRP", "WW2GI.GRP" };
+static const char *defaultdeffilename[GAMECOUNT] = { "duke3d.def", "nam.def", "napalm.def", "ww2gi.def" };
+static const char *defaultconfilename = "GAME.CON";
+static const char *defaultgameconfilename[GAMECOUNT] = { "EDUKE.CON", "NAM.CON", "NAPALM.CON", "WW2GI.CON" };
 
 // g_grpNamePtr can ONLY point to a malloc'd block (length BMAX_PATH)
 char *g_grpNamePtr = NULL;
diff --git a/polymer/eduke32/source/common_game.h b/polymer/eduke32/source/common_game.h
index 5667ac7c1..03a8ba77f 100644
--- a/polymer/eduke32/source/common_game.h
+++ b/polymer/eduke32/source/common_game.h
@@ -60,11 +60,6 @@ typedef enum basepal_ {
 
 extern const char *g_gameNamePtr;
 
-extern const char *defaultgamegrp[GAMECOUNT];
-extern const char *defaultdeffilename[GAMECOUNT];
-extern const char *defaultconfilename;
-extern const char *defaultgameconfilename[GAMECOUNT];
-
 extern char *g_grpNamePtr;
 extern char *g_scriptNamePtr;
 
diff --git a/polymer/eduke32/source/grpscan.c b/polymer/eduke32/source/grpscan.c
index 0069869ce..59ea9c06d 100644
--- a/polymer/eduke32/source/grpscan.c
+++ b/polymer/eduke32/source/grpscan.c
@@ -47,10 +47,10 @@ struct grpfile internalgrpfiles[NUMGRPFILES] =
     { "Duke Nukem 3D Mac Demo",                DUKEMD_CRC,  10444391, GAMEFLAG_DUKE|GAMEFLAG_SHAREWARE,      0, NULL,          NULL,        NULL },
     { "Duke it out in D.C.",                   DUKEDC_CRC,  8410183 , GAMEFLAG_DUKE|GAMEFLAG_ADDON, DUKE15_CRC, NULL,          NULL,        NULL },
     { "Duke Caribbean: Life's a Beach",        DUKECB_CRC,  22213819, GAMEFLAG_DUKE|GAMEFLAG_ADDON, DUKE15_CRC, NULL,          NULL,        NULL },
-    { "Duke: Nuclear Winter",                  DUKENW_CRC,  16169365, GAMEFLAG_DUKE|GAMEFLAG_ADDON, DUKE15_CRC, "nwinter.con", NULL,        NULL },
-    { "NAM",                                   NAM_CRC,     43448927, GAMEFLAG_NAM,                          0, "nam.con",     "nam.def",   NULL },
-    { "NAPALM",                                NAPALM_CRC,  44365728, GAMEFLAG_NAM|GAMEFLAG_NAPALM,          0, "napalm.con",  "nam.def",   NULL },
-    { "WWII GI",                               WW2GI_CRC,   77939508, GAMEFLAG_WW2GI|GAMEFLAG_NAM,           0, "ww2gi.con",   "ww2gi.def", NULL },
+    { "Duke: Nuclear Winter",                  DUKENW_CRC,  16169365, GAMEFLAG_DUKE|GAMEFLAG_ADDON, DUKE15_CRC, "NWINTER.CON", NULL,        NULL },
+    { "NAM",                                   NAM_CRC,     43448927, GAMEFLAG_NAM,                          0, NULL,          NULL,        NULL },
+    { "NAPALM",                                NAPALM_CRC,  44365728, GAMEFLAG_NAM|GAMEFLAG_NAPALM,          0, NULL,          NULL,        NULL },
+    { "WWII GI",                               WW2GI_CRC,   77939508, GAMEFLAG_WW2GI|GAMEFLAG_NAM,           0, NULL,          NULL,        NULL },
 };
 struct grpfile *foundgrps = NULL;
 struct grpfile *listgrps = NULL;