From da4fcec462458168cc0f997f861722727deff533 Mon Sep 17 00:00:00 2001
From: hendricks266 <hendricks266@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Wed, 27 Jun 2012 17:45:52 +0000
Subject: [PATCH] Fix the overlooking of EDUKE.CON in the absence of DUKE3D.GRP
 caused by r2726. Also, tweak a few string literals' use of quotation marks.

git-svn-id: https://svn.eduke32.com/eduke32@2789 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/build/src/engine.c | 4 ++--
 polymer/eduke32/source/common.c    | 2 +-
 polymer/eduke32/source/gamedef.c   | 4 ++--
 polymer/eduke32/source/rts.c       | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/polymer/eduke32/build/src/engine.c b/polymer/eduke32/build/src/engine.c
index f69675ff1..0059b1283 100644
--- a/polymer/eduke32/build/src/engine.c
+++ b/polymer/eduke32/build/src/engine.c
@@ -7359,7 +7359,7 @@ static int32_t loadtables(void)
         }
         else
         {
-            engineerrstr = "Failed to load 'tables.dat'!";
+            engineerrstr = "Failed to load \"tables.dat\"!";
             initprintf("ERROR: %s\n", engineerrstr);
             return 1;
         }
@@ -7421,7 +7421,7 @@ static int32_t loadpalette(void)
     if (paletteloaded != 0) return 0;
     if ((fil = kopen4load("palette.dat",0)) == -1)
     {
-        engineerrstr = "Failed to load 'palette.dat'!";
+        engineerrstr = "Failed to load \"palette.dat\"!";
         initprintf("ERROR: %s\n", engineerrstr);
         return -1;
     }
diff --git a/polymer/eduke32/source/common.c b/polymer/eduke32/source/common.c
index a40c425d1..e82c254d7 100644
--- a/polymer/eduke32/source/common.c
+++ b/polymer/eduke32/source/common.c
@@ -12,7 +12,7 @@
 #include "common.h"
 #include "common_game.h"
 
-int32_t g_gameType = 0;
+int32_t g_gameType = GAMEFLAG_DUKE;
 
 // grp/con/def handling
 
diff --git a/polymer/eduke32/source/gamedef.c b/polymer/eduke32/source/gamedef.c
index 4997b6c6f..17b05c0a1 100644
--- a/polymer/eduke32/source/gamedef.c
+++ b/polymer/eduke32/source/gamedef.c
@@ -5799,7 +5799,7 @@ void C_Compile(const char *filenam)
         {
 #ifdef WIN32
             Bsprintf(tempbuf,"Duke Nukem 3D game data was not found.  A valid copy of \"%s\" or other compatible data is needed to run EDuke32.\n\n"
-                     "You can find \"%s\" in the 'DN3DINST' or 'ATOMINST' directory on your Duke Nukem 3D installation CD.\n\n"
+                     "You can find \"%s\" in the \"DN3DINST\" or \"ATOMINST\" directory on your Duke Nukem 3D installation CD-ROM.\n\n"
                      "If you don't already own a copy of Duke or haven't seen your disc in years, don't worry -- you can download the full, registered "
                      "version of Duke Nukem 3D: Atomic Edition immediately for only $5.99 through our partnership with GOG.com.\n\n"
                      "Not a typo; it's less than 6 bucks.  Get Duke now?\n\n"
@@ -5825,7 +5825,7 @@ void C_Compile(const char *filenam)
             G_GameExit("");
 #else
             Bsprintf(tempbuf,"Duke Nukem 3D game data was not found.  A valid copy of \"%s\" or other compatible data is needed to run EDuke32.\n"
-                     "You can find \"%s\" in the 'DN3DINST' or 'ATOMINST' directory on your Duke Nukem 3D installation CD-ROM.\n\n"
+                     "You can find \"%s\" in the \"DN3DINST\" or \"ATOMINST\" directory on your Duke Nukem 3D installation CD-ROM.\n\n"
                      "EDuke32 will now close.",
                      G_GrpFile(),G_GrpFile());
             G_GameExit(tempbuf);
diff --git a/polymer/eduke32/source/rts.c b/polymer/eduke32/source/rts.c
index 33b77a8a9..39d479be2 100644
--- a/polymer/eduke32/source/rts.c
+++ b/polymer/eduke32/source/rts.c
@@ -79,18 +79,18 @@ int32_t RTS_AddFile(const char *filename)
     handle = kopen4loadfrommod((char *)filename, 0);
     if (handle < 0)
     {
-        initprintf("RTS file %s was not found\n",filename);
+        initprintf("RTS file \"%s\" was not found\n",filename);
         return -1;
     }
 
     startlump = rts_numlumps;
 
     // WAD file
-//    initprintf("    Adding %s.\n",filename);
+//    initprintf("    Adding \"%s\".\n",filename);
     kread(handle, &header, sizeof(header));
     if (strncmp(header.identification,"IWAD",4))
     {
-        initprintf("RTS file %s doesn't have IWAD id\n",filename);
+        initprintf("RTS file \"%s\" doesn't have IWAD id\n",filename);
         kclose(handle);
         return -1;
     }