zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-24 10:40:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Superficial text changes:

Browse source 
- Help window text cleaned and made more consistent between game and editor
 - Added help entry for "-clipmap"
 - Log text for using CON, DEF, and RTS files has been made consistent
 - All instances of '%s' have been replaced with \"%s\" because ' is a valid filename character. (At least on Windows.)

git-svn-id: https://svn.eduke32.com/eduke32@2538 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2012-03-26 05:05:57 +00:00
parent 3929d60744
commit 9f61e6e2d5
16 changed files with 138 additions and 132 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
polymer/eduke32/build/src/build.c
View file

@ -848,15 +848,15 @@ static void loadmhk(int32_t domessage)
if (!loadmaphack(levname)) if (!loadmaphack(levname))
{ {
if (domessage) if (domessage)
message("Loaded map hack file '%s'",levname); message("Loaded map hack file \"%s\"",levname);
else else
initprintf("Loaded map hack file '%s'\n",levname); initprintf("Loaded map hack file \"%s\"\n",levname);
} }
else else
{ {
mhk=2; mhk=2;
if (domessage) if (domessage)
message("No maphack found for map '%s'",boardfilename); message("No maphack found for map \"%s\"",boardfilename);
} }
} }
@ -8489,7 +8489,7 @@ int32_t getnumber_autocomplete(const char *namestart, char ch, int32_t *danum, i
if (*danum > 0 && *danum<32768) if (*danum > 0 && *danum<32768)
{ {
diddel = taglab_add(gotstr, *danum); diddel = taglab_add(gotstr, *danum);
message("Added label '%s' for tag %d%s%s", gotstr, *danum, message("Added label \"%s\" for tag %d%s%s", gotstr, *danum,
diddel?", deleting old ":"", diddel?", deleting old ":"",
(!diddel)?"":(diddel==1?"label":"tag")); (!diddel)?"":(diddel==1?"label":"tag"));
return 1; return 1;
@ -8501,7 +8501,7 @@ int32_t getnumber_autocomplete(const char *namestart, char ch, int32_t *danum, i
{ {
*danum = i; *danum = i;
diddel = taglab_add(gotstr, *danum); diddel = taglab_add(gotstr, *danum);
message("%sadded label '%s' for tag %d%s%s", message("%sadded label \"%s\" for tag %d%s%s",
diddel?"Auto-":"Automatically ", gotstr, *danum, diddel?"Auto-":"Automatically ", gotstr, *danum,
diddel?", deleting old ":"", diddel?", deleting old ":"",
(!diddel)?"":(diddel==1?"label":"tag")); (!diddel)?"":(diddel==1?"label":"tag"));

26
polymer/eduke32/build/src/defs.c
View file

@ -263,7 +263,7 @@ static int32_t defsparser(scriptfile *script)
kzfindfilestart(buf); kzfindfilestart(buf);
if (!kzfindfile(buf)) if (!kzfindfile(buf))
{ {
initprintf("Error: file '%s' does not exist\n",fn); initprintf("Error: file \"%s\" does not exist\n",fn);
pathsearchmode = i; pathsearchmode = i;
break; break;
} }
@ -295,7 +295,7 @@ static int32_t defsparser(scriptfile *script)
kzfindfilestart(buf); kzfindfilestart(buf);
if (!kzfindfile(buf)) if (!kzfindfile(buf))
{ {
initprintf("Error: file '%s' does not exist\n",fn[i]); initprintf("Error: file \"%s\" does not exist\n",fn[i]);
happy = 0; happy = 0;
} }
} }
@ -539,7 +539,7 @@ static int32_t defsparser(scriptfile *script)
kzfindfilestart(buf); kzfindfilestart(buf);
if (!kzfindfile(buf)) if (!kzfindfile(buf))
{ {
initprintf("Error: file '%s' does not exist\n",fn); initprintf("Error: file \"%s\" does not exist\n",fn);
pathsearchmode = i; pathsearchmode = i;
break; break;
} }
@ -861,7 +861,7 @@ static int32_t defsparser(scriptfile *script)
kzfindfilestart(buf); kzfindfilestart(buf);
if (!kzfindfile(buf)) if (!kzfindfile(buf))
{ {
initprintf("Error: file '%s' does not exist\n",skinfn); initprintf("Error: file \"%s\" does not exist\n",skinfn);
pathsearchmode = i; pathsearchmode = i;
break; break;
} }
@ -1243,7 +1243,7 @@ static int32_t defsparser(scriptfile *script)
kzfindfilestart(buf); kzfindfilestart(buf);
if (!kzfindfile(buf)) if (!kzfindfile(buf))
{ {
initprintf("Error: file '%s' does not exist\n",skinfn); initprintf("Error: file \"%s\" does not exist\n",skinfn);
pathsearchmode = i; pathsearchmode = i;
break; break;
} }
@ -1542,7 +1542,7 @@ static int32_t defsparser(scriptfile *script)
kzfindfilestart(buf); kzfindfilestart(buf);
if (!kzfindfile(buf)) if (!kzfindfile(buf))
{ {
initprintf("Error: file '%s' does not exist\n",fn[i]); initprintf("Error: file \"%s\" does not exist\n",fn[i]);
happy = 0; happy = 0;
} }
} }
@ -1615,7 +1615,7 @@ static int32_t defsparser(scriptfile *script)
kzfindfilestart(buf); kzfindfilestart(buf);
if (!kzfindfile(buf)) if (!kzfindfile(buf))
{ {
initprintf("Error: file '%s' does not exist\n",fn); initprintf("Error: file \"%s\" does not exist\n",fn);
pathsearchmode = oldpathsearchmode; pathsearchmode = oldpathsearchmode;
break; break;
} }
@ -1640,14 +1640,14 @@ static int32_t defsparser(scriptfile *script)
klseek(fd, 0, SEEK_SET); klseek(fd, 0, SEEK_SET);
if (kread(fd, filebuf, filesize)!=filesize) if (kread(fd, filebuf, filesize)!=filesize)
{ kclose(fd); Bfree(highpaldata); initprintf("Error: didn't read all of '%s'.\n", fn); break; } { kclose(fd); Bfree(highpaldata); initprintf("Error: didn't read all of \"%s\".\n", fn); break; }
kclose(fd); kclose(fd);
kpgetdim(filebuf, filesize, &xsiz, &ysiz); kpgetdim(filebuf, filesize, &xsiz, &ysiz);
if (xsiz != PR_HIGHPALOOKUP_DIM*PR_HIGHPALOOKUP_DIM || ysiz != PR_HIGHPALOOKUP_DIM) if (xsiz != PR_HIGHPALOOKUP_DIM*PR_HIGHPALOOKUP_DIM || ysiz != PR_HIGHPALOOKUP_DIM)
{ {
initprintf("Error: image dimensions of '%s' must be %dx%d.\n", initprintf("Error: image dimensions of \"%s\" must be %dx%d.\n",
fn, PR_HIGHPALOOKUP_DIM*PR_HIGHPALOOKUP_DIM, PR_HIGHPALOOKUP_DIM); fn, PR_HIGHPALOOKUP_DIM*PR_HIGHPALOOKUP_DIM, PR_HIGHPALOOKUP_DIM);
Bfree(filebuf); Bfree(highpaldata); Bfree(filebuf); Bfree(highpaldata);
break; break;
@ -1656,7 +1656,7 @@ static int32_t defsparser(scriptfile *script)
i = kprender(filebuf, filesize, (intptr_t)highpaldata, xsiz*sizeof(coltype), xsiz, ysiz, 0, 0); i = kprender(filebuf, filesize, (intptr_t)highpaldata, xsiz*sizeof(coltype), xsiz, ysiz, 0, 0);
Bfree(filebuf); Bfree(filebuf);
if (i) if (i)
{ Bfree(highpaldata); initprintf("Error: failed rendering '%s'.\n", fn); break; } { Bfree(highpaldata); initprintf("Error: failed rendering \"%s\".\n", fn); break; }
} }
polymer_definehighpalookup(basepal, pal, highpaldata); polymer_definehighpalookup(basepal, pal, highpaldata);
@ -1799,7 +1799,7 @@ static int32_t defsparser(scriptfile *script)
kzfindfilestart(buf); kzfindfilestart(buf);
if (!kzfindfile(buf)) if (!kzfindfile(buf))
{ {
initprintf("Error: file '%s' does not exist\n",fn); initprintf("Error: file \"%s\" does not exist\n",fn);
pathsearchmode = i; pathsearchmode = i;
break; break;
} }
@ -1874,7 +1874,7 @@ static int32_t defsparser(scriptfile *script)
kzfindfilestart(buf); kzfindfilestart(buf);
if (!kzfindfile(buf)) if (!kzfindfile(buf))
{ {
initprintf("Error: file '%s' does not exist\n",fn); initprintf("Error: file \"%s\" does not exist\n",fn);
pathsearchmode = i; pathsearchmode = i;
break; break;
} }
@ -2081,7 +2081,7 @@ int32_t loaddefinitionsfile(const char *fn)
if (!script) return -1; if (!script) return -1;
flushlogwindow = 1; flushlogwindow = 1;
initprintf("Loading '%s'\n",fn); initprintf("Loading \"%s\"\n",fn);
flushlogwindow = 0; flushlogwindow = 0;
defsparser(script); defsparser(script);

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

@ -16076,7 +16076,7 @@ void hash_free(hashtable_t *t)
{ {
tmp = cur; tmp = cur;
cur = cur->next; cur = cur->next;
// initprintf("Free %4d '%s'\n",tmp->key,(tmp->string)?tmp->string:"."); // initprintf("Free %4d \"%s\"\n",tmp->key,(tmp->string)?tmp->string:".");
if (tmp->string) if (tmp->string)
{ {
Bfree(tmp->string); Bfree(tmp->string);

2
polymer/eduke32/build/src/mdsprite.c
View file

@ -3366,7 +3366,7 @@ mdmodel_t *mdload(const char *filnam)
switch (B_LITTLE32(i)) switch (B_LITTLE32(i))
{ {
case 0x32504449: case 0x32504449:
// initprintf("Warning: model '%s' is version IDP2; wanted version IDP3\n",filnam); // initprintf("Warning: model \"%s\" is version IDP2; wanted version IDP3\n",filnam);
vm = (mdmodel_t *)md2load(fil,filnam); vm = (mdmodel_t *)md2load(fil,filnam);
break; //IDP2 break; //IDP2
case 0x33504449: case 0x33504449:

2
polymer/eduke32/build/src/osd.c
View file

@ -1032,7 +1032,7 @@ int32_t OSD_HandleChar(char ch)
if (!lastmatch->next) break; if (!lastmatch->next) break;
symb=findsymbol(osdedittmp, lastmatch->next); symb=findsymbol(osdedittmp, lastmatch->next);
} }
OSD_Printf(OSDTEXT_RED "Found %d possible completions for '%s':\n",num,osdedittmp); OSD_Printf(OSDTEXT_RED "Found %d possible completions for \"%s\":\n",num,osdedittmp);
maxwidth += 3; maxwidth += 3;
symb = tabc; symb = tabc;
OSD_Printf(" "); OSD_Printf(" ");

12
polymer/eduke32/build/src/polymost.c
View file

@ -775,7 +775,7 @@ void polymost_glinit()
if (!cacheindexptr) if (!cacheindexptr)
{ {
glusetexcache = 0; glusetexcache = 0;
initprintf("Unable to open cache index '%s': %s\n", ptempbuf, strerror(errno)); initprintf("Unable to open cache index \"%s\": %s\n", ptempbuf, strerror(errno));
return; return;
} }
@ -791,12 +791,12 @@ void polymost_glinit()
if (cachefilehandle < 0) if (cachefilehandle < 0)
{ {
initprintf("Unable to open cache file '%s': %s\n", TEXCACHEFILE, strerror(errno)); initprintf("Unable to open cache file \"%s\": %s\n", TEXCACHEFILE, strerror(errno));
glusetexcache = 0; glusetexcache = 0;
return; return;
} }
else else
initprintf("Opened '%s' as cache file\n", TEXCACHEFILE); initprintf("Opened \"%s\" as cache file\n", TEXCACHEFILE);
if (glusememcache && !dont_alloc_memcache) if (glusememcache && !dont_alloc_memcache)
{ {
@ -866,7 +866,7 @@ void invalidatecache(void)
if (!cacheindexptr) if (!cacheindexptr)
{ {
glusetexcache = 0; glusetexcache = 0;
initprintf("Unable to open cache index '%s': %s\n", ptempbuf, strerror(errno)); initprintf("Unable to open cache index \"%s\": %s\n", ptempbuf, strerror(errno));
return; return;
} }
@ -876,12 +876,12 @@ void invalidatecache(void)
if (cachefilehandle < 0) if (cachefilehandle < 0)
{ {
initprintf("Unable to open cache file '%s': %s\n", TEXCACHEFILE, strerror(errno)); initprintf("Unable to open cache file \"%s\": %s\n", TEXCACHEFILE, strerror(errno));
glusetexcache = 0; glusetexcache = 0;
return; return;
} }
else else
initprintf("Deleted and reopened '%s' as cache file\n", TEXCACHEFILE); initprintf("Deleted and reopened \"%s\" as cache file\n", TEXCACHEFILE);
} }
void resizeglcheck() void resizeglcheck()

69
polymer/eduke32/source/astub.c
View file

@ -1886,7 +1886,7 @@ static void ShowFileText(const char *name)
if ((fp=kopen4load(name,0)) == -1) if ((fp=kopen4load(name,0)) == -1)
{ {
Bsprintf(tempbuf, "ERROR: file '%s' not found.", name); Bsprintf(tempbuf, "ERROR: file \"%s\" not found.", name);
if (in3dmode) if (in3dmode)
printext256(1*4,4*8,whitecol,-1,tempbuf,0); printext256(1*4,4*8,whitecol,-1,tempbuf,0);
else else
@ -8356,25 +8356,28 @@ int32_t ExtPreSaveMap(void)
static void G_ShowParameterHelp(void) static void G_ShowParameterHelp(void)
{ {
const char *s = "Usage: mapster32 [OPTIONS] [FILE]\n\n" const char *s = "Usage: mapster32 [files] [options]\n\n"
"-gFILE, -grp FILE\tUse extra group file FILE\n" "-g[file.grp], -grp [file.grp]\tLoad extra group file\n"
"-hFILE\t\tUse definitions file FILE\n" "-h[file.def]\t\tLoad an alternate definitions file\n"
"-xFILE\t\tUse FILE instead of GAME.CON for getting sound definitions\n" "-x[game.con]\t\tLoad a custom CON script for getting sound definitions\n"
"-mh FILE\t\tInclude additional definitions module FILE\n" "-mh [file.def]\t\tInclude additional definitions module\n"
"-mx FILE\t\tInclude additional CON module FILE for getting sound definitions\n" "-mx [file.con]\t\tInclude additional CON module for getting sound definitions\n"
"-jDIR, -game_dir DIR\n" "-j[dir], -game_dir [dir]\n"
"\t\tAdds DIR to the file path stack\n" "\t\t\tAdds a directory to the file path stack\n"
"-cachesize #\tSets cache size, in Kb\n" "-cachesize #\t\tSets cache size, in Kb\n"
"-check\t\tEnables map pointer checking when saving\n" "-check\t\t\tEnables map pointer checking when saving\n"
"-namesfile FILE\tUses FILE instead of NAMES.H for tile names\n" #ifdef HAVE_CLIPSHAPE_FEATURE
"-nocheck\t\tDisables map pointer checking when saving (default)\n" // kept for script compat "-clipmap [file.map]\t\tLoad an additional clipping map for use with clipshape\n"
#endif
"-namesfile [file.h]\t\tLoad a custom NAMES.H for tile names\n"
"-nocheck\t\t\tDisables map pointer checking when saving (default)\n" // kept for script compat
#if defined RENDERTYPEWIN || (defined RENDERTYPESDL && ((defined __APPLE__ && defined OSX_STARTUPWINDOW) || defined HAVE_GTK2)) #if defined RENDERTYPEWIN || (defined RENDERTYPESDL && ((defined __APPLE__ && defined OSX_STARTUPWINDOW) || defined HAVE_GTK2))
"-setup\t\tDisplays the configuration dialog\n" "-setup\t\t\tDisplays the configuration dialog\n"
#endif #endif
#if !defined(_WIN32) #if !defined(_WIN32)
"-usecwd\t\tRead game data and configuration file from working directory\n" "-usecwd\t\t\tRead game data and configuration file from working directory\n"
#endif #endif
"\n-?, -help, --help\tDisplay this help message and exit" "\n-?, -help, --help\t\tDisplay this help message and exit"
; ;
Bsprintf(tempbuf, "Mapster32 %s %s", VERSION, s_buildRev); Bsprintf(tempbuf, "Mapster32 %s %s", VERSION, s_buildRev);
wm_msgbox(tempbuf, "%s", s); wm_msgbox(tempbuf, "%s", s);
@ -8686,7 +8689,7 @@ static void G_CheckCommandLine(int32_t argc, const char **argv)
g_defNamePtr = c; g_defNamePtr = c;
g_skipDefaultDefs = 1; g_skipDefaultDefs = 1;
COPYARG(i); COPYARG(i);
initprintf("Using DEF file: %s.\n",g_defNamePtr); initprintf("Using DEF file \"%s\".\n",g_defNamePtr);
} }
break; break;
case 'j': case 'j':
@ -8710,7 +8713,7 @@ static void G_CheckCommandLine(int32_t argc, const char **argv)
gamecon = c; gamecon = c;
g_skipDefaultCons = 1; g_skipDefaultCons = 1;
COPYARG(i); COPYARG(i);
initprintf("Using CON file '%s'.\n",gamecon); initprintf("Using CON file \"%s\".\n",gamecon);
break; break;
} }
} }
@ -8730,7 +8733,7 @@ static void G_CheckCommandLine(int32_t argc, const char **argv)
COPYARG(i); COPYARG(i);
g_defNamePtr = (char *)argv[i++]; g_defNamePtr = (char *)argv[i++];
g_skipDefaultDefs = 1; g_skipDefaultDefs = 1;
initprintf("Using DEF file: %s.\n",g_defNamePtr); initprintf("Using DEF file \"%s\".\n",g_defNamePtr);
continue; continue;
} }
else if (!Bstrcasecmp(k,".con")) else if (!Bstrcasecmp(k,".con"))
@ -8738,7 +8741,7 @@ static void G_CheckCommandLine(int32_t argc, const char **argv)
COPYARG(i); COPYARG(i);
gamecon = (char *)argv[i++]; gamecon = (char *)argv[i++];
g_skipDefaultCons = 1; g_skipDefaultCons = 1;
initprintf("Using CON file '%s'.\n",gamecon); initprintf("Using CON file \"%s\".\n",gamecon);
continue; continue;
} }
} }
@ -9582,7 +9585,7 @@ static void DoAutoload(const char *fn)
while (findfiles) while (findfiles)
{ {
Bsprintf(tempbuf, "autoload/%s/%s", fn, findfiles->name); Bsprintf(tempbuf, "autoload/%s/%s", fn, findfiles->name);
initprintf("Using group file '%s'.\n", tempbuf); initprintf("Using group file \"%s\".\n", tempbuf);
initgroupfile(tempbuf); initgroupfile(tempbuf);
findfiles = findfiles->next; findfiles = findfiles->next;
} }
@ -9642,10 +9645,10 @@ int32_t parsegroupfiles(scriptfile *script)
int32_t j = initgroupfile(fn); int32_t j = initgroupfile(fn);
if (j == -1) if (j == -1)
initprintf("Could not find group file '%s'.\n",fn); initprintf("Could not find group file \"%s\".\n",fn);
else else
{ {
initprintf("Using group file '%s'.\n",fn); initprintf("Using group file \"%s\".\n",fn);
if (!NoAutoLoad) if (!NoAutoLoad)
DoAutoload(fn); DoAutoload(fn);
} }
@ -10224,12 +10227,12 @@ static int32_t loadconsounds(const char *fn)
scriptfile *script; scriptfile *script;
int32_t ret, i; int32_t ret, i;
initprintf("Loading sounds from '%s'\n",fn); initprintf("Loading sounds from \"%s\"\n",fn);
script = scriptfile_fromfile(fn); script = scriptfile_fromfile(fn);
if (!script) if (!script)
{ {
initprintf("Error loading sounds: file '%s' not found.\n", fn); initprintf("Error loading sounds: file \"%s\" not found.\n", fn);
return -1; return -1;
} }
ret = parseconsounds(script); ret = parseconsounds(script);
@ -10242,9 +10245,9 @@ static int32_t loadconsounds(const char *fn)
Bfree(g_scriptModules); Bfree(g_scriptModules);
if (ret < 0) if (ret < 0)
initprintf("There was an error parsing '%s'.\n", fn); initprintf("There was an error parsing \"%s\".\n", fn);
else if (ret == 0) else if (ret == 0)
initprintf("'%s' doesn't contain sound definitions. No sounds loaded.\n", fn); initprintf("\"%s\" doesn't contain sound definitions. No sounds loaded.\n", fn);
else else
initprintf("Loaded %d sound definitions.\n", ret); initprintf("Loaded %d sound definitions.\n", ret);
@ -10354,7 +10357,7 @@ int32_t ExtInit(void)
if (getenv("DUKE3DGRP")) if (getenv("DUKE3DGRP"))
{ {
g_grpNamePtr = getenv("DUKE3DGRP"); g_grpNamePtr = getenv("DUKE3DGRP");
initprintf("Using %s as main GRP file\n", g_grpNamePtr); initprintf("Using \"%s\" as main GRP file\n", g_grpNamePtr);
} }
i = initgroupfile(g_grpNamePtr); i = initgroupfile(g_grpNamePtr);
@ -10370,7 +10373,7 @@ int32_t ExtInit(void)
while (findfiles) while (findfiles)
{ {
Bsprintf(tempbuf,"autoload/%s",findfiles->name); Bsprintf(tempbuf,"autoload/%s",findfiles->name);
initprintf("Using group file '%s'.\n",tempbuf); initprintf("Using group file \"%s\".\n",tempbuf);
initgroupfile(tempbuf); initgroupfile(tempbuf);
findfiles = findfiles->next; findfiles = findfiles->next;
} }
@ -10384,7 +10387,7 @@ int32_t ExtInit(void)
{ {
g_defNamePtr = getenv("DUKE3DDEF"); g_defNamePtr = getenv("DUKE3DDEF");
g_skipDefaultDefs = 1; g_skipDefaultDefs = 1;
initprintf("Using '%s' as definitions file\n", g_defNamePtr); initprintf("Using \"%s\" as definitions file\n", g_defNamePtr);
} }
if (g_skipDefaultDefs == 0) if (g_skipDefaultDefs == 0)
if (g_defNamePtr != defsfilename) if (g_defNamePtr != defsfilename)
@ -10401,10 +10404,10 @@ int32_t ExtInit(void)
{ {
s = CommandGrps->next; s = CommandGrps->next;
j = initgroupfile(CommandGrps->str); j = initgroupfile(CommandGrps->str);
if (j == -1) initprintf("Could not find group file '%s'.\n",CommandGrps->str); if (j == -1) initprintf("Could not find group file \"%s\".\n",CommandGrps->str);
else else
{ {
initprintf("Using group file '%s'.\n",CommandGrps->str); initprintf("Using group file \"%s\".\n",CommandGrps->str);
if (!NoAutoLoad) if (!NoAutoLoad)
DoAutoload(CommandGrps->str); DoAutoload(CommandGrps->str);
} }
@ -10422,7 +10425,7 @@ int32_t ExtInit(void)
glusetexcache = -1; glusetexcache = -1;
if (Bstrcmp(setupfilename, "mapster32.cfg")) if (Bstrcmp(setupfilename, "mapster32.cfg"))
initprintf("Using config file '%s'.\n",setupfilename); initprintf("Using config file \"%s\".\n",setupfilename);
if (loadsetup(setupfilename) < 0) if (loadsetup(setupfilename) < 0)
initprintf("Configuration file not found, using defaults.\n"), rv = 1; initprintf("Configuration file not found, using defaults.\n"), rv = 1;

77
polymer/eduke32/source/game.c
View file

@ -7989,19 +7989,22 @@ static void G_ShowParameterHelp(void)
"Files can be *.grp/zip/con/def/rts\n" "Files can be *.grp/zip/con/def/rts\n"
"\n" "\n"
"-cfg [file.cfg]\tUse an alternate configuration file\n" "-cfg [file.cfg]\tUse an alternate configuration file\n"
#ifdef HAVE_CLIPSHAPE_FEATURE
"-clipmap [file.map]\tLoad an additional clipping map for use with clipshape\n"
#endif
"-connect [host]\tConnect to a multiplayer game\n" "-connect [host]\tConnect to a multiplayer game\n"
"-c#\t\tUse MP mode #, 1 = Dukematch, 2 = Coop, 3 = Dukematch(no spawn)\n" "-c#\t\tUse MP mode #, 1 = Dukematch, 2 = Coop, 3 = Dukematch(no spawn)\n"
"-d[file.edm]\tPlay a demo\n" "-d[file.edm]\tPlay a demo\n"
"-g[file.grp]\tUse additional game data\n" "-g[file.grp]\tLoad additional game data\n"
"-h[file.def]\tUse an alternate def\n" "-h[file.def]\tLoad an alternate definitions file\n"
"-j[dir]\t\tAdds a directory to EDuke32's search list\n" "-j[dir]\t\tAdds a directory to EDuke32's search list\n"
"-l#\t\tWarp to level #, see -v\n" "-l#\t\tWarp to level #, see -v\n"
"-map [file.map]\tLoads a map\n" "-map [file.map]\tLoads a map\n"
"-mh [file.def]\tInclude an additional def module\n" "-mh [file.def]\tInclude an additional definitions module\n"
"-mx [file.con]\tInclude an additional CON script module\n" "-mx [file.con]\tInclude an additional CON script module\n"
"-m\t\tDisable monsters\n" "-m\t\tDisable monsters\n"
"-nam\t\tRun in NAM/NAPALM compatibility mode\n" "-nam\t\tRun in NAM/NAPALM compatibility mode\n"
"-rts [file.rts]\tLoad custom Remote Ridicule sound bank\n" "-rts [file.rts]\tLoad a custom Remote Ridicule sound bank\n"
"-r\t\tRecord demo\n" "-r\t\tRecord demo\n"
"-s#\t\tSet skill level (1-4)\n" "-s#\t\tSet skill level (1-4)\n"
"-server\t\tStart a multiplayer game for other players to join\n" "-server\t\tStart a multiplayer game for other players to join\n"
@ -8099,7 +8102,7 @@ static void G_DoAutoload(const char *fn)
while (findfiles) while (findfiles)
{ {
Bsprintf(tempbuf,"autoload/%s/%s",fn,findfiles->name); Bsprintf(tempbuf,"autoload/%s/%s",fn,findfiles->name);
initprintf("Using file '%s' as game data.\n",tempbuf); initprintf("Using file \"%s\" as game data.\n",tempbuf);
initgroupfile(tempbuf); initgroupfile(tempbuf);
findfiles = findfiles->next; findfiles = findfiles->next;
} }
@ -8254,10 +8257,10 @@ static int32_t parsedefinitions_game(scriptfile *script, int32_t preload)
int32_t j = initgroupfile(fn); int32_t j = initgroupfile(fn);
if (j == -1) if (j == -1)
initprintf("Could not find file '%s'.\n",fn); initprintf("Could not find file \"%s\".\n",fn);
else else
{ {
initprintf("Using file '%s' as game data.\n",fn); initprintf("Using file \"%s\" as game data.\n",fn);
if (!g_noAutoLoad && !ud.config.NoAutoLoad) if (!g_noAutoLoad && !ud.config.NoAutoLoad)
G_DoAutoload(fn); G_DoAutoload(fn);
} }
@ -8328,7 +8331,7 @@ static int32_t parsedefinitions_game(scriptfile *script, int32_t preload)
kzfindfilestart(buf); kzfindfilestart(buf);
if (!kzfindfile(buf)) if (!kzfindfile(buf))
{ {
initprintf("Error: file '%s' does not exist\n",fn); initprintf("Error: file \"%s\" does not exist\n",fn);
pathsearchmode = i; pathsearchmode = i;
break; break;
} }
@ -8458,14 +8461,14 @@ static int32_t parsedefinitions_game(scriptfile *script, int32_t preload)
if (!bad) if (!bad)
{ {
anim_hi_numsounds[animnum] = numpairs; anim_hi_numsounds[animnum] = numpairs;
initprintf("Defined sound sequence for hi-anim '%s' with %d frame/sound pairs\n", initprintf("Defined sound sequence for hi-anim \"%s\" with %d frame/sound pairs\n",
hardcoded_anim_tokens[animnum].text, numpairs); hardcoded_anim_tokens[animnum].text, numpairs);
} }
else else
{ {
Bfree(anim_hi_sounds[animnum]); Bfree(anim_hi_sounds[animnum]);
anim_hi_sounds[animnum] = NULL; anim_hi_sounds[animnum] = NULL;
initprintf("Failed defining sound sequence for hi-anim '%s'.\n", initprintf("Failed defining sound sequence for hi-anim \"%s\".\n",
hardcoded_anim_tokens[animnum].text); hardcoded_anim_tokens[animnum].text);
} }
} }
@ -8526,7 +8529,7 @@ static int32_t parsedefinitions_game(scriptfile *script, int32_t preload)
kzfindfilestart(buf); kzfindfilestart(buf);
if (!kzfindfile(buf)) if (!kzfindfile(buf))
{ {
initprintf("Error: file '%s' does not exist\n",fn); initprintf("Error: file \"%s\" does not exist\n",fn);
pathsearchmode = i; pathsearchmode = i;
break; break;
} }
@ -8843,7 +8846,7 @@ static void G_CheckCommandLine(int32_t argc, const char **argv)
{ {
g_rtsNamePtr = (char *)argv[i+1]; g_rtsNamePtr = (char *)argv[i+1];
Bstrcpy(ud.rtsname, g_rtsNamePtr); Bstrcpy(ud.rtsname, g_rtsNamePtr);
initprintf("Using .RTS file '%s'\n",ud.rtsname); initprintf("Using RTS file \"%s\".\n",ud.rtsname);
i++; i++;
} }
i++; i++;
@ -8998,7 +9001,7 @@ static void G_CheckCommandLine(int32_t argc, const char **argv)
{ {
g_defNamePtr = c; g_defNamePtr = c;
g_skipDefaultDefs = 1; g_skipDefaultDefs = 1;
initprintf("Using DEF file: %s.\n",g_defNamePtr); initprintf("Using DEF file \"%s\".\n",g_defNamePtr);
} }
break; break;
case 'j': case 'j':
@ -9122,7 +9125,7 @@ static void G_CheckCommandLine(int32_t argc, const char **argv)
{ {
g_scriptNamePtr = c; g_scriptNamePtr = c;
g_skipDefaultCons = 1; g_skipDefaultCons = 1;
initprintf("Using CON file '%s'.\n",g_scriptNamePtr); initprintf("Using CON file \"%s\".\n",g_scriptNamePtr);
} }
break; break;
case '0': case '0':
@ -9164,21 +9167,21 @@ static void G_CheckCommandLine(int32_t argc, const char **argv)
{ {
g_scriptNamePtr = (char *)argv[i++]; g_scriptNamePtr = (char *)argv[i++];
g_skipDefaultCons = 1; g_skipDefaultCons = 1;
initprintf("Using CON file '%s'.\n",g_scriptNamePtr); initprintf("Using CON file \"%s\".\n",g_scriptNamePtr);
continue; continue;
} }
if (!Bstrcasecmp(k,".def")) if (!Bstrcasecmp(k,".def"))
{ {
g_defNamePtr = (char *)argv[i++]; g_defNamePtr = (char *)argv[i++];
g_skipDefaultDefs = 1; g_skipDefaultDefs = 1;
initprintf("Using DEF file: %s.\n",g_defNamePtr); initprintf("Using DEF file \"%s\".\n",g_defNamePtr);
continue; continue;
} }
if (!Bstrcasecmp(k,".rts")) if (!Bstrcasecmp(k,".rts"))
{ {
g_rtsNamePtr = (char *)argv[i++]; g_rtsNamePtr = (char *)argv[i++];
Bstrcpy(ud.rtsname, g_rtsNamePtr); Bstrcpy(ud.rtsname, g_rtsNamePtr);
initprintf("Using .RTS file '%s'\n",ud.rtsname); initprintf("Using RTS file \"%s\".\n",ud.rtsname);
continue; continue;
} }
} }
@ -9627,12 +9630,12 @@ static void G_Startup(void)
i = kopen4loadfrommod(boardfilename,0); i = kopen4loadfrommod(boardfilename,0);
if (i!=-1) if (i!=-1)
{ {
initprintf("Using level: '%s'.\n",boardfilename); initprintf("Using level: \"%s\".\n",boardfilename);
kclose(i); kclose(i);
} }
else else
{ {
initprintf("Level '%s' not found.\n",boardfilename); initprintf("Level \"%s\" not found.\n",boardfilename);
boardfilename[0] = 0; boardfilename[0] = 0;
} }
} }
@ -9690,7 +9693,7 @@ static void G_Startup(void)
if (g_modDir[0] != '/' && (cwd = (char *)getcwd(NULL, 0))) if (g_modDir[0] != '/' && (cwd = (char *)getcwd(NULL, 0)))
{ {
chdir(g_modDir); chdir(g_modDir);
// initprintf("g_rootDir '%s'\nmod '%s'\ncwd '%s'\n",g_rootDir,mod_dir,cwd); // initprintf("g_rootDir \"%s\"\nmod \"%s\"\ncwd \"%s\"\n",g_rootDir,mod_dir,cwd);
if (loadpics("tiles000.art",MAXCACHE1DSIZE) < 0) if (loadpics("tiles000.art",MAXCACHE1DSIZE) < 0)
{ {
chdir(cwd); chdir(cwd);
@ -9981,7 +9984,7 @@ int32_t app_main(int32_t argc,const char **argv)
if (getenv("DUKE3DGRP")) if (getenv("DUKE3DGRP"))
{ {
g_grpNamePtr = getenv("DUKE3DGRP"); g_grpNamePtr = getenv("DUKE3DGRP");
initprintf("Using %s as main GRP file\n", g_grpNamePtr); initprintf("Using \"%s\" as main GRP file\n", g_grpNamePtr);
} }
#ifdef _WIN32 #ifdef _WIN32
@ -10042,7 +10045,7 @@ int32_t app_main(int32_t argc,const char **argv)
} }
if (Bstrcmp(setupfilename, SETUPFILENAME)) if (Bstrcmp(setupfilename, SETUPFILENAME))
initprintf("Using config file '%s'.\n",setupfilename); initprintf("Using config file \"%s\".\n",setupfilename);
ScanGroups(); ScanGroups();
{ {
@ -10148,12 +10151,12 @@ int32_t app_main(int32_t argc,const char **argv)
Bsprintf(tempbuf,"%stexcache",dir); Bsprintf(tempbuf,"%stexcache",dir);
getfilenames(tempbuf,"*"); getfilenames(tempbuf,"*");
CLEAN_DIRECTORY: CLEAN_DIRECTORY:
// initprintf("Cleaning '%s'\n",tempbuf); // initprintf("Cleaning \"%s\"\n",tempbuf);
while (findfiles) while (findfiles)
{ {
Bsprintf(g_szBuf,"%s/%s",tempbuf,findfiles->name); Bsprintf(g_szBuf,"%s/%s",tempbuf,findfiles->name);
if (unlink(g_szBuf)) if (unlink(g_szBuf))
initprintf("ERROR: couldn't remove '%s': %s\n",g_szBuf,strerror(errno)); initprintf("ERROR: couldn't remove \"%s\": %s\n",g_szBuf,strerror(errno));
findfiles = findfiles->next; findfiles = findfiles->next;
} }
while (finddirs) while (finddirs)
@ -10175,12 +10178,12 @@ CLEAN_DIRECTORY:
} }
else else
{ {
initprintf("ERROR: couldn't remove '%s': %s\n",g_szBuf,strerror(errno)); initprintf("ERROR: couldn't remove \"%s\": %s\n",g_szBuf,strerror(errno));
} }
} }
else else
{ {
initprintf("Removed '%s'\n",g_szBuf); initprintf("Removed \"%s\"\n",g_szBuf);
finddirs = finddirs->next; finddirs = finddirs->next;
} }
} }
@ -10195,8 +10198,8 @@ CLEAN_DIRECTORY:
Bsprintf(tempbuf,"%stexcache",dir); Bsprintf(tempbuf,"%stexcache",dir);
if (rmdir(tempbuf)) if (rmdir(tempbuf))
initprintf("ERROR: couldn't remove '%s': %s\n",tempbuf,strerror(errno)); initprintf("ERROR: couldn't remove \"%s\": %s\n",tempbuf,strerror(errno));
else initprintf("Removed '%s'\n",tempbuf); else initprintf("Removed \"%s\"\n",tempbuf);
} }
} }
} }
@ -10204,9 +10207,9 @@ CLEAN_DIRECTORY:
#endif #endif
if ((i = initgroupfile(g_grpNamePtr)) == -1) if ((i = initgroupfile(g_grpNamePtr)) == -1)
initprintf("Warning: could not find main data file '%s'!\n",g_grpNamePtr); initprintf("Warning: could not find main data file \"%s\"!\n",g_grpNamePtr);
else else
initprintf("Using '%s' as main game data file.\n", g_grpNamePtr); initprintf("Using \"%s\" as main game data file.\n", g_grpNamePtr);
if (!g_noAutoLoad && !ud.config.NoAutoLoad) if (!g_noAutoLoad && !ud.config.NoAutoLoad)
{ {
@ -10218,7 +10221,7 @@ CLEAN_DIRECTORY:
while (findfiles) while (findfiles)
{ {
Bsprintf(tempbuf,"autoload/%s",findfiles->name); Bsprintf(tempbuf,"autoload/%s",findfiles->name);
initprintf("Using file '%s' as game data.\n",tempbuf); initprintf("Using file \"%s\" as game data.\n",tempbuf);
initgroupfile(tempbuf); initgroupfile(tempbuf);
findfiles = findfiles->next; findfiles = findfiles->next;
} }
@ -10239,7 +10242,7 @@ CLEAN_DIRECTORY:
while (findfiles) while (findfiles)
{ {
Bsprintf(tempbuf,"%s/%s",g_modDir,findfiles->name); Bsprintf(tempbuf,"%s/%s",g_modDir,findfiles->name);
initprintf("Using file '%s' as game data.\n",tempbuf); initprintf("Using file \"%s\" as game data.\n",tempbuf);
initgroupfile(tempbuf); initgroupfile(tempbuf);
findfiles = findfiles->next; findfiles = findfiles->next;
} }
@ -10250,7 +10253,7 @@ CLEAN_DIRECTORY:
{ {
g_defNamePtr = getenv("DUKE3DDEF"); g_defNamePtr = getenv("DUKE3DDEF");
g_skipDefaultDefs = 1; g_skipDefaultDefs = 1;
initprintf("Using '%s' as definitions file\n", g_defNamePtr); initprintf("Using \"%s\" as definitions file\n", g_defNamePtr);
} }
if (g_skipDefaultDefs == 0) if (g_skipDefaultDefs == 0)
if (g_defNamePtr != defsfilename) if (g_defNamePtr != defsfilename)
@ -10269,11 +10272,11 @@ CLEAN_DIRECTORY:
s = CommandGrps->next; s = CommandGrps->next;
if ((j = initgroupfile(CommandGrps->str)) == -1) if ((j = initgroupfile(CommandGrps->str)) == -1)
initprintf("Could not find file '%s'.\n",CommandGrps->str); initprintf("Could not find file \"%s\".\n",CommandGrps->str);
else else
{ {
g_groupFileHandle = j; g_groupFileHandle = j;
initprintf("Using file '%s' as game data.\n",CommandGrps->str); initprintf("Using file \"%s\" as game data.\n",CommandGrps->str);
if (!g_noAutoLoad && !ud.config.NoAutoLoad) if (!g_noAutoLoad && !ud.config.NoAutoLoad)
G_DoAutoload(CommandGrps->str); G_DoAutoload(CommandGrps->str);
} }
@ -10341,7 +10344,7 @@ CLEAN_DIRECTORY:
if (!loaddefinitionsfile(g_defNamePtr)) if (!loaddefinitionsfile(g_defNamePtr))
{ {
initprintf("Definitions file '%s' loaded.\n",g_defNamePtr); initprintf("Definitions file \"%s\" loaded.\n",g_defNamePtr);
loaddefinitions_game(g_defNamePtr, FALSE); loaddefinitions_game(g_defNamePtr, FALSE);
} }
@ -10388,7 +10391,7 @@ CLEAN_DIRECTORY:
RTS_Init(ud.rtsname); RTS_Init(ud.rtsname);
if (rts_numlumps) if (rts_numlumps)
initprintf("Using .RTS file '%s'\n",ud.rtsname); initprintf("Using RTS file \"%s\".\n",ud.rtsname);
if (ud.last_level) if (ud.last_level)
Bstrcpy(ud.rtsname, defaultrtsfilename); Bstrcpy(ud.rtsname, defaultrtsfilename);

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

@ -1620,7 +1620,7 @@ static void C_GetNextVarType(int32_t type)
textptr++; textptr++;
/// now pointing at 'xxx' /// now pointing at 'xxx'
C_GetNextLabelName(); C_GetNextLabelName();
/*initprintf("found xxx label of '%s'\n", label+(g_numLabels<<6));*/ /*initprintf("found xxx label of \"%s\"\n", label+(g_numLabels<<6));*/
if (i == g_iSpriteVarID) if (i == g_iSpriteVarID)
lLabelID=C_GetLabelNameOffset(&actorH,Bstrtolower(label+(g_numLabels<<6))); lLabelID=C_GetLabelNameOffset(&actorH,Bstrtolower(label+(g_numLabels<<6)));
@ -2174,7 +2174,7 @@ static int32_t C_ParseCommand(int32_t loop)
textptr++; textptr++;
/// now pointing at 'xxx' /// now pointing at 'xxx'
C_GetNextLabelName(); C_GetNextLabelName();
//printf("found xxx label of '%s'\n", label+(g_numLabels<<6)); //printf("found xxx label of \"%s\"\n", label+(g_numLabels<<6));
lLabelID=C_GetLabelNameOffset(&projectileH,Bstrtolower(label+(g_numLabels<<6))); lLabelID=C_GetLabelNameOffset(&projectileH,Bstrtolower(label+(g_numLabels<<6)));
//printf("LabelID is %d\n",lLabelID); //printf("LabelID is %d\n",lLabelID);
@ -2240,7 +2240,7 @@ static int32_t C_ParseCommand(int32_t loop)
//printf("Done Translating number. '%.20s'\n",textptr); //printf("Done Translating number. '%.20s'\n",textptr);
C_GetNextValue(LABEL_DEFINE); // get flags C_GetNextValue(LABEL_DEFINE); // get flags
//Bsprintf(g_szBuf,"Adding GameVar='%s', val=%l, flags=%lX",label+(g_numLabels<<6), //Bsprintf(g_szBuf,"Adding GameVar=\"%s\", val=%l, flags=%lX",label+(g_numLabels<<6),
// *(g_scriptPtr-2), *(g_scriptPtr-1)); // *(g_scriptPtr-2), *(g_scriptPtr-1));
//AddLog(g_szBuf); //AddLog(g_szBuf);
if ((*(g_scriptPtr-1)&GAMEVAR_USER_MASK)==3) if ((*(g_scriptPtr-1)&GAMEVAR_USER_MASK)==3)
@ -2330,7 +2330,7 @@ static int32_t C_ParseCommand(int32_t loop)
//printf("Translated. '%.20s'\n",textptr); //printf("Translated. '%.20s'\n",textptr);
if (i == -1) if (i == -1)
{ {
// printf("Defining Definition '%s' to be '%d'\n",label+(g_numLabels<<6),*(g_scriptPtr-1)); // printf("Defining Definition \"%s\" to be '%d'\n",label+(g_numLabels<<6),*(g_scriptPtr-1));
hash_add(&h_labels,label+(g_numLabels<<6),g_numLabels,0); hash_add(&h_labels,label+(g_numLabels<<6),g_numLabels,0);
labeltype[g_numLabels] = LABEL_DEFINE; labeltype[g_numLabels] = LABEL_DEFINE;
labelcode[g_numLabels++] = *(g_scriptPtr-1); labelcode[g_numLabels++] = *(g_scriptPtr-1);
@ -2976,7 +2976,7 @@ static int32_t C_ParseCommand(int32_t loop)
textptr++; textptr++;
/// now pointing at 'xxx' /// now pointing at 'xxx'
C_GetNextLabelName(); C_GetNextLabelName();
//printf("found xxx label of '%s'\n", label+(g_numLabels<<6)); //printf("found xxx label of \"%s\"\n", label+(g_numLabels<<6));
lLabelID=C_GetLabelNameID(SectorLabels,&sectorH,Bstrtolower(label+(g_numLabels<<6))); lLabelID=C_GetLabelNameID(SectorLabels,&sectorH,Bstrtolower(label+(g_numLabels<<6)));
@ -3106,7 +3106,7 @@ static int32_t C_ParseCommand(int32_t loop)
textptr++; textptr++;
/// now pointing at 'xxx' /// now pointing at 'xxx'
C_GetNextLabelName(); C_GetNextLabelName();
//printf("found xxx label of '%s'\n", label+(g_numLabels<<6)); //printf("found xxx label of \"%s\"\n", label+(g_numLabels<<6));
lLabelID=C_GetLabelNameID(WallLabels,&wallH,Bstrtolower(label+(g_numLabels<<6))); lLabelID=C_GetLabelNameID(WallLabels,&wallH,Bstrtolower(label+(g_numLabels<<6)));
@ -3168,7 +3168,7 @@ static int32_t C_ParseCommand(int32_t loop)
textptr++; textptr++;
/// now pointing at 'xxx' /// now pointing at 'xxx'
C_GetNextLabelName(); C_GetNextLabelName();
//printf("found xxx label of '%s'\n", label+(g_numLabels<<6)); //printf("found xxx label of \"%s\"\n", label+(g_numLabels<<6));
lLabelID=C_GetLabelNameOffset(&playerH,Bstrtolower(label+(g_numLabels<<6))); lLabelID=C_GetLabelNameOffset(&playerH,Bstrtolower(label+(g_numLabels<<6)));
//printf("LabelID is %d\n",lLabelID); //printf("LabelID is %d\n",lLabelID);
@ -3244,7 +3244,7 @@ static int32_t C_ParseCommand(int32_t loop)
textptr++; textptr++;
/// now pointing at 'xxx' /// now pointing at 'xxx'
C_GetNextLabelName(); C_GetNextLabelName();
//printf("found xxx label of '%s'\n", label+(g_numLabels<<6)); //printf("found xxx label of \"%s\"\n", label+(g_numLabels<<6));
lLabelID=C_GetLabelNameOffset(&inputH,Bstrtolower(label+(g_numLabels<<6))); lLabelID=C_GetLabelNameOffset(&inputH,Bstrtolower(label+(g_numLabels<<6)));
//printf("LabelID is %d\n",lLabelID); //printf("LabelID is %d\n",lLabelID);
@ -3295,7 +3295,7 @@ static int32_t C_ParseCommand(int32_t loop)
textptr++; textptr++;
/// now pointing at 'xxx' /// now pointing at 'xxx'
C_GetNextLabelName(); C_GetNextLabelName();
//printf("found xxx label of '%s'\n", label+(g_numLabels<<6)); //printf("found xxx label of \"%s\"\n", label+(g_numLabels<<6));
lLabelID=C_GetLabelNameID(UserdefsLabels,&userdefH,Bstrtolower(label+(g_numLabels<<6))); lLabelID=C_GetLabelNameID(UserdefsLabels,&userdefH,Bstrtolower(label+(g_numLabels<<6)));
@ -3380,7 +3380,7 @@ static int32_t C_ParseCommand(int32_t loop)
// get the ID of the DEF // get the ID of the DEF
C_GetNextLabelName(); C_GetNextLabelName();
//printf("found label of '%s'\n", label+(g_numLabels<<6)); //printf("found label of \"%s\"\n", label+(g_numLabels<<6));
// Check to see if it's a keyword // Check to see if it's a keyword
if (hash_find(&h_keywords,label+(g_numLabels<<6))>=0) if (hash_find(&h_keywords,label+(g_numLabels<<6))>=0)
@ -3391,7 +3391,7 @@ static int32_t C_ParseCommand(int32_t loop)
} }
i=GetDefID(label+(g_numLabels<<6)); i=GetDefID(label+(g_numLabels<<6));
//printf("Label '%s' ID is %d\n",label+(g_numLabels<<6), i); //printf("Label \"%s\" ID is %d\n",label+(g_numLabels<<6), i);
if (i<0) if (i<0)
{ {
// not a defined DEF // not a defined DEF
@ -3489,7 +3489,7 @@ static int32_t C_ParseCommand(int32_t loop)
/// now pointing at 'xxx' /// now pointing at 'xxx'
C_GetNextLabelName(); C_GetNextLabelName();
//printf("found xxx label of '%s'\n", label+(g_numLabels<<6)); //printf("found xxx label of \"%s\"\n", label+(g_numLabels<<6));
lLabelID=C_GetLabelNameOffset(&actorH,Bstrtolower(label+(g_numLabels<<6))); lLabelID=C_GetLabelNameOffset(&actorH,Bstrtolower(label+(g_numLabels<<6)));
//printf("LabelID is %d\n",lLabelID); //printf("LabelID is %d\n",lLabelID);
@ -3568,7 +3568,7 @@ static int32_t C_ParseCommand(int32_t loop)
textptr++; textptr++;
/// now pointing at 'xxx' /// now pointing at 'xxx'
C_GetNextLabelName(); C_GetNextLabelName();
//printf("found xxx label of '%s'\n", label+(g_numLabels<<6)); //printf("found xxx label of \"%s\"\n", label+(g_numLabels<<6));
lLabelID=C_GetLabelNameOffset(&tspriteH,Bstrtolower(label+(g_numLabels<<6))); lLabelID=C_GetLabelNameOffset(&tspriteH,Bstrtolower(label+(g_numLabels<<6)));
//printf("LabelID is %d\n",lLabelID); //printf("LabelID is %d\n",lLabelID);
@ -5061,7 +5061,7 @@ repeatcase:
else setupfilename[0] = 0; else setupfilename[0] = 0;
Bstrcat(setupfilename,temp); Bstrcat(setupfilename,temp);
initprintf("Using config file '%s'.\n",setupfilename); initprintf("Using config file \"%s\".\n",setupfilename);
CONFIG_ReadSetup(); CONFIG_ReadSetup();
@ -5733,8 +5733,8 @@ void C_Compile(const char *filenam)
if (g_loadFromGroupOnly == 1 || numgroupfiles == 0) if (g_loadFromGroupOnly == 1 || numgroupfiles == 0)
{ {
#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.\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"
@ -5759,8 +5759,8 @@ 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_grpNamePtr,g_grpNamePtr); g_grpNamePtr,g_grpNamePtr);
G_GameExit(tempbuf); G_GameExit(tempbuf);

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

@ -456,7 +456,7 @@ int32_t Gv_NewVar(const char *pszLabel, intptr_t lValue, uint32_t dwFlags)
if (aGameVars[i].dwFlags & (GAMEVAR_PTR_MASK)) if (aGameVars[i].dwFlags & (GAMEVAR_PTR_MASK))
{ {
// warning++; // warning++;
// initprintf("%s:%d: warning: Internal gamevar '%s' cannot be redefined.\n",g_szScriptFileName,g_lineNumber,label+(g_numLabels<<6)); // initprintf("%s:%d: warning: Internal gamevar \"%s\" cannot be redefined.\n",g_szScriptFileName,g_lineNumber,label+(g_numLabels<<6));
C_ReportError(-1); C_ReportError(-1);
initprintf("%s:%d: warning: cannot redefine internal gamevar `%s'.\n",g_szScriptFileName,g_lineNumber,label+(g_numLabels<<6)); initprintf("%s:%d: warning: cannot redefine internal gamevar `%s'.\n",g_szScriptFileName,g_lineNumber,label+(g_numLabels<<6));
return 0; return 0;
@ -696,7 +696,7 @@ void __fastcall Gv_SetVar(register int32_t id, register int32_t lValue, register
{ {
if ((unsigned)id >= (unsigned)g_gameVarCount) goto badvarid; if ((unsigned)id >= (unsigned)g_gameVarCount) goto badvarid;
//Bsprintf(g_szBuf,"SGVI: %d ('%s') to %d for %d %d",id,aGameVars[id].szLabel,lValue,iActor,iPlayer); //Bsprintf(g_szBuf,"SGVI: %d (\"%s\") to %d for %d %d",id,aGameVars[id].szLabel,lValue,iActor,iPlayer);
//AddLog(g_szBuf); //AddLog(g_szBuf);
switch (aGameVars[id].dwFlags & (GAMEVAR_USER_MASK|GAMEVAR_PTR_MASK)) switch (aGameVars[id].dwFlags & (GAMEVAR_USER_MASK|GAMEVAR_PTR_MASK))

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

@ -107,7 +107,7 @@ int32_t El_RunOnce(El_State *estate, const char *fn)
if (i == LUA_ERRSYNTAX) if (i == LUA_ERRSYNTAX)
{ {
OSD_Printf("state '%s' syntax error: %s\n", estate->name, lua_tostring(estate->L, 1)); // get err msg OSD_Printf("state \"%s\" syntax error: %s\n", estate->name, lua_tostring(estate->L, 1)); // get err msg
lua_pop(estate->L, 1); lua_pop(estate->L, 1);
return 3; return 3;
} }
@ -120,7 +120,7 @@ int32_t El_RunOnce(El_State *estate, const char *fn)
if (i == LUA_ERRRUN) if (i == LUA_ERRRUN)
{ {
OSD_Printf("state '%s' runtime error: %s\n", estate->name, lua_tostring(estate->L, 1)); // get err msg OSD_Printf("state \"%s\" runtime error: %s\n", estate->name, lua_tostring(estate->L, 1)); // get err msg
lua_pop(estate->L, 1); lua_pop(estate->L, 1);
return 4; return 4;
} }
@ -166,7 +166,7 @@ int32_t El_CallEvent(El_State *estate, int32_t eventidx)
if (i == LUA_ERRRUN) if (i == LUA_ERRRUN)
{ {
OSD_Printf("event '%s' (state '%s') runtime error: %s\n", EventNames[eventidx].text, OSD_Printf("event \"%s\" (state \"%s\") runtime error: %s\n", EventNames[eventidx].text,
estate->name, lua_tostring(estate->L, 1)); // get err msg estate->name, lua_tostring(estate->L, 1)); // get err msg
lua_pop(estate->L, 1); lua_pop(estate->L, 1);
return 4; return 4;

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

@ -1224,7 +1224,7 @@ static void C_GetNextVarType(int32_t type)
C_GetNextLabelName(0); C_GetNextLabelName(0);
/*initprintf("found xxx label of '%s'\n", label+(g_numLabels*MAXLABELLEN));*/ /*initprintf("found xxx label of \"%s\"\n", label+(g_numLabels*MAXLABELLEN));*/
if (lightp) if (lightp)
lLabelID = C_GetLabelNameID(LightLabels, &h_light, Bstrtolower(tlabel)); lLabelID = C_GetLabelNameID(LightLabels, &h_light, Bstrtolower(tlabel));
else if (id==M32_SPRITE_VAR_ID || id==M32_TSPRITE_VAR_ID) else if (id==M32_SPRITE_VAR_ID || id==M32_TSPRITE_VAR_ID)
@ -1679,7 +1679,7 @@ static int32_t C_ParseCommand(void)
i = hash_find(&h_labels, tlabel); i = hash_find(&h_labels, tlabel);
if (i == -1) if (i == -1)
{ {
// printf("Defining Definition '%s' to be '%d'\n",label+(g_numLabels*MAXLABELLEN),*(g_scriptPtr-1)); // printf("Defining Definition \"%s\" to be '%d'\n",label+(g_numLabels*MAXLABELLEN),*(g_scriptPtr-1));
// Bmemcpy(label+(g_numLabels*MAXLABELLEN), tlabel, MAXLABELLEN); // Bmemcpy(label+(g_numLabels*MAXLABELLEN), tlabel, MAXLABELLEN);
C_CopyLabel(); C_CopyLabel();
hash_add(&h_labels, label+(g_numLabels*MAXLABELLEN), g_numLabels, 0); hash_add(&h_labels, label+(g_numLabels*MAXLABELLEN), g_numLabels, 0);
@ -2520,7 +2520,7 @@ repeatcase:
C_GetNextValue(LABEL_DEFINE); // get initial value C_GetNextValue(LABEL_DEFINE); // get initial value
C_GetNextValue(LABEL_DEFINE); // get flags C_GetNextValue(LABEL_DEFINE); // get flags
//Bsprintf(g_szBuf,"Adding GameVar='%s', val=%l, flags=%lX",label+(g_numLabels*MAXLABELLEN), *(g_scriptPtr-2), *(g_scriptPtr-1)); AddLog(g_szBuf); //Bsprintf(g_szBuf,"Adding GameVar=\"%s\", val=%l, flags=%lX",label+(g_numLabels*MAXLABELLEN), *(g_scriptPtr-2), *(g_scriptPtr-1)); AddLog(g_szBuf);
// global var: can't define default // global var: can't define default
if (g_numCompilerErrors==0) if (g_numCompilerErrors==0)

6
polymer/eduke32/source/mdump.cpp
View file

@ -79,20 +79,20 @@ LONG MiniDumper::TopLevelFilter( struct _EXCEPTION_POINTERS *pExceptionInfo )
BOOL bOK = pDump( GetCurrentProcess(), GetCurrentProcessId(), hFile, MiniDumpNormal, &ExInfo, NULL, NULL ); BOOL bOK = pDump( GetCurrentProcess(), GetCurrentProcessId(), hFile, MiniDumpNormal, &ExInfo, NULL, NULL );
if (bOK) if (bOK)
{ {
sprintf( szScratch, "Saved dump file to '%s'", szDumpPath ); sprintf( szScratch, "Saved dump file to \"%s\"", szDumpPath );
szResult = szScratch; szResult = szScratch;
retval = EXCEPTION_EXECUTE_HANDLER; retval = EXCEPTION_EXECUTE_HANDLER;
} }
else else
{ {
sprintf( szScratch, "Failed to save dump file to '%s' (error %d)", szDumpPath, GetLastError() ); sprintf( szScratch, "Failed to save dump file to \"%s\" (error %d)", szDumpPath, GetLastError() );
szResult = szScratch; szResult = szScratch;
} }
::CloseHandle(hFile); ::CloseHandle(hFile);
} }
else else
{ {
sprintf( szScratch, "Failed to create dump file '%s' (error %d)", szDumpPath, GetLastError() ); sprintf( szScratch, "Failed to create dump file \"%s\" (error %d)", szDumpPath, GetLastError() );
szResult = szScratch; szResult = szScratch;
} }
} }

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

@ -1834,7 +1834,7 @@ static void G_LoadMapHack(char *outbuf, const char *filename)
} }
if (!loadmaphack(outbuf)) if (!loadmaphack(outbuf))
initprintf("Loaded map hack file '%s'\n",outbuf); initprintf("Loaded map hack file \"%s\"\n",outbuf);
} }
static void realloc_and_copy_musicfn(int32_t level_number, const char *levnamebuf, int32_t altp) static void realloc_and_copy_musicfn(int32_t level_number, const char *levnamebuf, int32_t altp)
@ -1982,7 +1982,7 @@ int32_t G_EnterLevel(int32_t g)
if (loadboard(boardfilename,0,&g_player[0].ps->pos.x, &g_player[0].ps->pos.y, if (loadboard(boardfilename,0,&g_player[0].ps->pos.x, &g_player[0].ps->pos.y,
&g_player[0].ps->pos.z, &g_player[0].ps->ang,&g_player[0].ps->cursectnum) == -1) &g_player[0].ps->pos.z, &g_player[0].ps->ang,&g_player[0].ps->cursectnum) == -1)
{ {
OSD_Printf(OSD_ERROR "Map '%s' not found!\n",boardfilename); OSD_Printf(OSD_ERROR "Map \"%s\" not found!\n",boardfilename);
//G_GameExit(tempbuf); //G_GameExit(tempbuf);
return 1; return 1;
} }
@ -2013,7 +2013,7 @@ int32_t G_EnterLevel(int32_t g)
if (loadboard(levname,1,&g_player[0].ps->pos.x, &g_player[0].ps->pos.y, if (loadboard(levname,1,&g_player[0].ps->pos.x, &g_player[0].ps->pos.y,
&g_player[0].ps->pos.z, &g_player[0].ps->ang,&g_player[0].ps->cursectnum) == -1) &g_player[0].ps->pos.z, &g_player[0].ps->ang,&g_player[0].ps->cursectnum) == -1)
{ {
OSD_Printf(OSD_ERROR "Map '%s' not found!\n",MapInfo[(ud.volume_number*MAXLEVELS)+ud.level_number].filename); OSD_Printf(OSD_ERROR "Map \"%s\" not found!\n",MapInfo[(ud.volume_number*MAXLEVELS)+ud.level_number].filename);
//G_GameExit(tempbuf); //G_GameExit(tempbuf);
return 1; return 1;
} }

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

@ -332,7 +332,7 @@ int32_t G_SavePlayer(int32_t spot)
if (!fil) if (!fil)
{ {
return -1; return -1;
OSD_Printf("G_SavePlayer: failed opening '%s' for writing: %s\n", OSD_Printf("G_SavePlayer: failed opening \"%s\" for writing: %s\n",
temp, strerror(errno)); temp, strerror(errno));
} }
} }

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

@ -228,7 +228,7 @@ int32_t S_PlayMusic(const char *fn, const int32_t sel)
if (fp < 0) if (fp < 0)
{ {
OSD_Printf(OSD_ERROR "S_PlayMusic(): error: can't open '%s' for playback!\n",fn); OSD_Printf(OSD_ERROR "S_PlayMusic(): error: can't open \"%s\" for playback!\n",fn);
return 0; return 0;
} }
@ -238,7 +238,7 @@ int32_t S_PlayMusic(const char *fn, const int32_t sel)
if ((g_musicSize = kread(fp, (char *)MusicPtr, MusicLen)) != MusicLen) if ((g_musicSize = kread(fp, (char *)MusicPtr, MusicLen)) != MusicLen)
{ {
OSD_Printf(OSD_ERROR "S_PlayMusic(): error: read %d bytes from '%s', expected %d\n",g_musicSize, fn, MusicLen); OSD_Printf(OSD_ERROR "S_PlayMusic(): error: read %d bytes from \"%s\", expected %d\n",g_musicSize, fn, MusicLen);
kclose(fp); kclose(fp);
g_musicSize = 0; g_musicSize = 0;
return 0; return 0;