From 6ed8f27e777335eab181980eb90557ce4be27caa Mon Sep 17 00:00:00 2001
From: hendricks266 <hendricks266@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Sun, 8 Mar 2015 07:59:03 +0000
Subject: [PATCH] Expand the grpinfo feature to allow defining GRPs requiring
 NAM, NAPALM, or WWII GI.

git-svn-id: https://svn.eduke32.com/eduke32@5050 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/source/common_game.h | 1 +
 polymer/eduke32/source/grpscan.c     | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/polymer/eduke32/source/common_game.h b/polymer/eduke32/source/common_game.h
index 40675161e..bc6c4a296 100644
--- a/polymer/eduke32/source/common_game.h
+++ b/polymer/eduke32/source/common_game.h
@@ -20,6 +20,7 @@ extern int32_t usecwd;
 #define GAMEFLAG_ADDON      0x00000010
 #define GAMEFLAG_SHAREWARE  0x00000020
 #define GAMEFLAG_DUKEBETA   0x00000060 // includes 0x20 since it's a shareware beta
+#define GAMEFLAGMASK        0x0000007F // flags allowed from grpinfo
 #define GAMEFLAG_NWINTER    0x00000080
 
 extern int32_t g_gameType;
diff --git a/polymer/eduke32/source/grpscan.c b/polymer/eduke32/source/grpscan.c
index 69b15b9bc..29189f74d 100644
--- a/polymer/eduke32/source/grpscan.c
+++ b/polymer/eduke32/source/grpscan.c
@@ -68,11 +68,18 @@ static void LoadList(const char * filename)
 
     scriptfile_addsymbolvalue("GAMEFLAG_DUKE", GAMEFLAG_DUKE);
     scriptfile_addsymbolvalue("GAMEFLAG_ADDON", GAMEFLAG_DUKE|GAMEFLAG_ADDON);
+    scriptfile_addsymbolvalue("GAMEFLAG_NAM", GAMEFLAG_NAM);
+    scriptfile_addsymbolvalue("GAMEFLAG_NAPALM", GAMEFLAG_NAM|GAMEFLAG_NAPALM);
+    scriptfile_addsymbolvalue("GAMEFLAG_WW2GI", GAMEFLAG_NAM|GAMEFLAG_WW2GI);
     scriptfile_addsymbolvalue("DUKE15_CRC", DUKE15_CRC);
+    scriptfile_addsymbolvalue("DUKEPP_CRC", DUKEPP_CRC);
     scriptfile_addsymbolvalue("DUKE13_CRC", DUKE13_CRC);
     scriptfile_addsymbolvalue("DUKEDC_CRC", DUKEDC_CRC);
     scriptfile_addsymbolvalue("DUKECB_CRC", DUKECB_CRC);
     scriptfile_addsymbolvalue("DUKENW_CRC", DUKENW_CRC);
+    scriptfile_addsymbolvalue("NAM_CRC", NAM_CRC);
+    scriptfile_addsymbolvalue("NAPALM_CRC", NAPALM_CRC);
+    scriptfile_addsymbolvalue("WW2GI_CRC", WW2GI_CRC);
 
     while (!scriptfile_eof(script))
     {
@@ -129,7 +136,7 @@ static void LoadList(const char * filename)
                     scriptfile_getstring(script,&gdef); break;
 
                 case T_FLAGS:
-                    scriptfile_getsymbol(script,&gflags); break;
+                    scriptfile_getsymbol(script,&gflags); gflags &= GAMEFLAGMASK; break;
                 case T_DEPCRC:
                     scriptfile_getsymbol(script,&gdepcrc); break;
                 case T_CRC: