From 59076748449de166f94778fef45561f04b0b0353 Mon Sep 17 00:00:00 2001
From: terminx <terminx@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Mon, 7 Jul 2008 22:03:11 +0000
Subject: [PATCH] Oops

Fatigue is the mortal enemy of working code and the best friend of oversights, apparently :p


git-svn-id: https://svn.eduke32.com/eduke32@844 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/source/astub.c | 22 +++++++++++----------
 polymer/eduke32/source/game.c  | 36 ++++++++++++++++++----------------
 2 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/polymer/eduke32/source/astub.c b/polymer/eduke32/source/astub.c
index 76e3d294f..2f96532a5 100644
--- a/polymer/eduke32/source/astub.c
+++ b/polymer/eduke32/source/astub.c
@@ -6760,16 +6760,6 @@ static void checkcommandline(int argc, const char **argv)
 #endif
             }
 
-            k = Bstrchr(c,'.');
-            if (k)
-            {
-                if (!Bstrcasecmp(k,".grp") || !Bstrcasecmp(k,".zip"))
-                {
-                    addgroup(argv[i++]);
-                    continue;
-                }
-            }
-
             if ((*c == '/') || (*c == '-'))
             {
                 c++;
@@ -6798,6 +6788,18 @@ static void checkcommandline(int argc, const char **argv)
                     break;
                 }
             }
+            else
+            {
+                k = Bstrchr(c,'.');
+                if (k)
+                {
+                    if (!Bstrcasecmp(k,".grp") || !Bstrcasecmp(k,".zip"))
+                    {
+                        addgroup(argv[i++]);
+                        continue;
+                    }
+                }
+            }
             i++;
         }
     }
diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c
index 8e8bcf4bd..854a6c1bf 100644
--- a/polymer/eduke32/source/game.c
+++ b/polymer/eduke32/source/game.c
@@ -9031,23 +9031,6 @@ static void checkcommandline(int argc, const char **argv)
 #endif
             }
 
-            k = Bstrchr(c,'.');
-            if (k)
-            {
-                if (!Bstrcasecmp(k,".grp") || !Bstrcasecmp(k,".zip"))
-                {
-                    addgroup(argv[i++]);
-                    continue;
-                }
-                if (!Bstrcasecmp(k,".con"))
-                {
-                    confilename = (char *)argv[i++];
-                    userconfiles = 1;
-                    initprintf("Using CON file '%s'.\n",confilename);
-                    continue;
-                }
-            }
-
             if (firstnet > 0)
             {
                 if (*c == '-' || *c == '/')
@@ -9317,6 +9300,25 @@ static void checkcommandline(int argc, const char **argv)
                     break;
                 }
             }
+            else
+            {
+                k = Bstrchr(c,'.');
+                if (k)
+                {
+                    if (!Bstrcasecmp(k,".grp") || !Bstrcasecmp(k,".zip"))
+                    {
+                        addgroup(argv[i++]);
+                        continue;
+                    }
+                    if (!Bstrcasecmp(k,".con"))
+                    {
+                        confilename = (char *)argv[i++];
+                        userconfiles = 1;
+                        initprintf("Using CON file '%s'.\n",confilename);
+                        continue;
+                    }
+                }
+            }
             i++;
         }
     }