zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-12 03:00:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

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.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@2789 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2012-06-27 17:45:52 +00:00
parent c001749dee
commit da4fcec462
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
polymer/eduke32/build/src/engine.c
View file

@ -7359,7 +7359,7 @@ static int32_t loadtables(void)
} }
else else
{ {
engineerrstr = "Failed to load 'tables.dat'!"; engineerrstr = "Failed to load \"tables.dat\"!";
initprintf("ERROR: %s\n", engineerrstr); initprintf("ERROR: %s\n", engineerrstr);
return 1; return 1;
} }
@ -7421,7 +7421,7 @@ static int32_t loadpalette(void)
if (paletteloaded != 0) return 0; if (paletteloaded != 0) return 0;
if ((fil = kopen4load("palette.dat",0)) == -1) if ((fil = kopen4load("palette.dat",0)) == -1)
{ {
engineerrstr = "Failed to load 'palette.dat'!"; engineerrstr = "Failed to load \"palette.dat\"!";
initprintf("ERROR: %s\n", engineerrstr); initprintf("ERROR: %s\n", engineerrstr);
return -1; return -1;
} }

2
polymer/eduke32/source/common.c
View file

@ -12,7 +12,7 @@
#include "common.h" #include "common.h"
#include "common_game.h" #include "common_game.h"
int32_t g_gameType = 0; int32_t g_gameType = GAMEFLAG_DUKE;
// grp/con/def handling // grp/con/def handling

4
polymer/eduke32/source/gamedef.c
View file

@ -5799,7 +5799,7 @@ void C_Compile(const char *filenam)
{ {
#ifdef WIN32 #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" 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 " "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" "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" "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(""); G_GameExit("");
#else #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" 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.", "EDuke32 will now close.",
G_GrpFile(),G_GrpFile()); G_GrpFile(),G_GrpFile());
G_GameExit(tempbuf); G_GameExit(tempbuf);

6
polymer/eduke32/source/rts.c
View file

@ -79,18 +79,18 @@ int32_t RTS_AddFile(const char *filename)
handle = kopen4loadfrommod((char *)filename, 0); handle = kopen4loadfrommod((char *)filename, 0);
if (handle < 0) if (handle < 0)
{ {
initprintf("RTS file %s was not found\n",filename); initprintf("RTS file \"%s\" was not found\n",filename);
return -1; return -1;
} }
startlump = rts_numlumps; startlump = rts_numlumps;
// WAD file // WAD file
// initprintf(" Adding %s.\n",filename); // initprintf(" Adding \"%s\".\n",filename);
kread(handle, &header, sizeof(header)); kread(handle, &header, sizeof(header));
if (strncmp(header.identification,"IWAD",4)) 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); kclose(handle);
return -1; return -1;
} }