From 9fcbb72c5961752eb99bb009abd9febfd8c74a27 Mon Sep 17 00:00:00 2001
From: terminx <terminx@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Sat, 22 Jul 2006 02:54:07 +0000
Subject: [PATCH] GRP loading fixes

git-svn-id: https://svn.eduke32.com/eduke32@236 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/source/game.c | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c
index 8ad8df078..3319891aa 100644
--- a/polymer/eduke32/source/game.c
+++ b/polymer/eduke32/source/game.c
@@ -59,6 +59,7 @@ char playerswhenstarted;
 char qe,cp,usecwd = 0;
 
 static int32 CommandSetup = 0;
+static int32 NoSetup = 0;
 static int32 CommandSoundToggleOff = 0;
 static int32 CommandMusicToggleOff = 0;
 static char *CommandMap = NULL;
@@ -8874,6 +8875,7 @@ void app_main(int argc,char **argv)
     for (i=1;i<argc;i++) {
         if (argv[i][0] != '-' && argv[i][0] != '/') continue;
         if (!Bstrcasecmp(argv[i]+1, "setup")) CommandSetup = TRUE;
+        else if (!Bstrcasecmp(argv[i]+1, "net")) NoSetup = TRUE;
 		else if (!Bstrcasecmp(argv[i]+1, "nam")) {
 			strcpy(defaultduke3dgrp, "nam.grp");
 			namversion = 1;
@@ -8884,13 +8886,6 @@ void app_main(int argc,char **argv)
         }
     }
 
-    if (getenv("DUKE3DGRP")) {
-        duke3dgrp = getenv("DUKE3DGRP");
-        initprintf("Using `%s' as main GRP file\n", duke3dgrp);
-    }
-
-    checkcommandline(argc,argv);
-
     i = CONFIG_ReadSetup();
 
     if (preinitengine()) {
@@ -8900,7 +8895,7 @@ void app_main(int argc,char **argv)
     }
 
 #if defined RENDERTYPEWIN || (defined RENDERTYPESDL && !defined __APPLE__ && defined HAVE_GTK2)
-    if (i < 0 || (netparam == NULL && ForceSetup) || CommandSetup) {
+    if (i < 0 || !NoSetup && ForceSetup || CommandSetup) {
         if (quitevent || !startwin_run()) {
             uninitengine();
             exit(0);
@@ -8915,6 +8910,11 @@ void app_main(int argc,char **argv)
 		Bsprintf(confilename, "nam.con");
 	}
 
+    if (getenv("DUKE3DGRP")) {
+        duke3dgrp = getenv("DUKE3DGRP");
+        initprintf("Using `%s' as main GRP file\n", duke3dgrp);
+    }
+
     initgroupfile(duke3dgrp);
     i = kopen4load("DUKESW.BIN",1); // JBF 20030810
     if (i!=-1) {
@@ -8922,9 +8922,15 @@ void app_main(int argc,char **argv)
         shareware = 1;
         kclose(i);
     }
+
     copyprotect();
     if (cp) return;
 
+    checkcommandline(argc,argv);
+
+    if (VOLUMEALL)
+        loadgroupfiles(duke3ddef);
+
     // gotta set the proper title after we compile the CONs if this is the full version
 
     if (VOLUMEALL) wm_setapptitle(HEAD2);
@@ -8932,9 +8938,6 @@ void app_main(int argc,char **argv)
 
     ud.multimode = 1;
 
-    if (VOLUMEALL)
-        loadgroupfiles(duke3ddef);
-
     initprintf("\n");
 
     if (condebug)