zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-16 01:11:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rewrite code for the "-rts" command line parameter to remove an unnecessary int32_t, prevent needless string copying, factor out duplicate math, centralize the default RTS name, and prevent clobbering of the RTSName CFG setting.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@2420 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2012-03-05 07:24:34 +00:00
parent 1c2ea1e96e
commit 3fdb7ee8fc
3 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
polymer/eduke32/source/config.c
View file

@ -262,7 +262,8 @@ void CONFIG_SetDefaults(void)
ud.config.CheckForUpdates = 1; ud.config.CheckForUpdates = 1;
Bstrcpy(ud.rtsname, "DUKE.RTS"); if (g_rtsNamePtr == NULL)
Bstrcpy(ud.rtsname, defaultrtsfilename);
Bstrcpy(szPlayerName, "Duke"); Bstrcpy(szPlayerName, "Duke");
Bstrcpy(ud.ridecule[0], "An inspiration for birth control."); Bstrcpy(ud.ridecule[0], "An inspiration for birth control.");
@ -658,7 +659,8 @@ int32_t CONFIG_ReadSetup(void)
Bstrncpy(szPlayerName,tempbuf,sizeof(szPlayerName)-1); Bstrncpy(szPlayerName,tempbuf,sizeof(szPlayerName)-1);
szPlayerName[sizeof(szPlayerName)-1] = '\0'; szPlayerName[sizeof(szPlayerName)-1] = '\0';
SCRIPT_GetString(ud.config.scripthandle, "Comm Setup","RTSName",&ud.rtsname[0]); if (g_rtsNamePtr == NULL)
SCRIPT_GetString(ud.config.scripthandle, "Comm Setup","RTSName",&ud.rtsname[0]);
SCRIPT_GetNumber(ud.config.scripthandle, "Setup","ConfigVersion",&ud.configversion); SCRIPT_GetNumber(ud.config.scripthandle, "Setup","ConfigVersion",&ud.configversion);
SCRIPT_GetNumber(ud.config.scripthandle, "Setup","ForceSetup",&ud.config.ForceSetup); SCRIPT_GetNumber(ud.config.scripthandle, "Setup","ForceSetup",&ud.config.ForceSetup);
@ -997,7 +999,8 @@ void CONFIG_WriteSetup(uint32_t flags)
} }
SCRIPT_PutString(ud.config.scripthandle, "Comm Setup","PlayerName",&szPlayerName[0]); SCRIPT_PutString(ud.config.scripthandle, "Comm Setup","PlayerName",&szPlayerName[0]);
SCRIPT_PutString(ud.config.scripthandle, "Comm Setup","RTSName",&ud.rtsname[0]); if (g_rtsNamePtr == NULL)
SCRIPT_PutString(ud.config.scripthandle, "Comm Setup","RTSName",&ud.rtsname[0]);
{ {
char commmacro[] = "CommbatMacro# "; char commmacro[] = "CommbatMacro# ";

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

@ -110,7 +110,6 @@ uint8_t *basepaltable[BASEPALCOUNT] = { palette, water_pal, slime_pal, dre_alms,
static int32_t g_skipDefaultCons = 0; static int32_t g_skipDefaultCons = 0;
static int32_t g_skipDefaultDefs = 0; // primarily for NAM/WWII GI appeasement static int32_t g_skipDefaultDefs = 0; // primarily for NAM/WWII GI appeasement
static int32_t g_skipDefaultRTS = 0;
int32_t voting = -1; int32_t voting = -1;
int32_t vote_map = -1, vote_episode = -1; int32_t vote_map = -1, vote_episode = -1;
@ -122,6 +121,7 @@ static int32_t g_noLogo = 0;
char defaultduke3dgrp[BMAX_PATH] = "duke3d.grp"; char defaultduke3dgrp[BMAX_PATH] = "duke3d.grp";
char defsfilename[BMAX_PATH] = "duke3d.def"; char defsfilename[BMAX_PATH] = "duke3d.def";
static char defaultconfilename[2][BMAX_PATH] = { "EDUKE.CON", "GAME.CON" }; static char defaultconfilename[2][BMAX_PATH] = { "EDUKE.CON", "GAME.CON" };
char defaultrtsfilename[128] = "DUKE.RTS";
char *g_grpNamePtr = defaultduke3dgrp; char *g_grpNamePtr = defaultduke3dgrp;
char *g_defNamePtr = defsfilename; char *g_defNamePtr = defsfilename;
@ -8783,9 +8783,8 @@ static void G_CheckCommandLine(int32_t argc, const char **argv)
{ {
if (argc > i+1) if (argc > i+1)
{ {
Bstrcpy(ud.rtsname, (char *)argv[i+1]);
g_rtsNamePtr = (char *)argv[i+1]; g_rtsNamePtr = (char *)argv[i+1];
g_skipDefaultRTS = 1; Bstrcpy(ud.rtsname, g_rtsNamePtr);
initprintf("Using .RTS file '%s'\n",ud.rtsname); initprintf("Using .RTS file '%s'\n",ud.rtsname);
i++; i++;
} }
@ -9107,9 +9106,8 @@ static void G_CheckCommandLine(int32_t argc, const char **argv)
} }
if (!Bstrcasecmp(k,".rts")) if (!Bstrcasecmp(k,".rts"))
{ {
g_rtsNamePtr = (char *)argv[i]; g_rtsNamePtr = (char *)argv[i++];
Bstrcpy(ud.rtsname, (char *)argv[i++]); Bstrcpy(ud.rtsname, g_rtsNamePtr);
g_skipDefaultRTS = 1;
initprintf("Using .RTS file '%s'\n",ud.rtsname); initprintf("Using .RTS file '%s'\n",ud.rtsname);
continue; continue;
} }
@ -9908,9 +9906,6 @@ int32_t app_main(int32_t argc,const char **argv)
i = CONFIG_ReadSetup(); i = CONFIG_ReadSetup();
if (g_skipDefaultRTS)
Bstrcpy(ud.rtsname, g_rtsNamePtr);
if (getenv("DUKE3DGRP")) if (getenv("DUKE3DGRP"))
{ {
g_grpNamePtr = getenv("DUKE3DGRP"); g_grpNamePtr = getenv("DUKE3DGRP");
@ -10304,17 +10299,18 @@ CLEAN_DIRECTORY:
playerswhenstarted = ud.multimode; playerswhenstarted = ud.multimode;
ud.last_level = 0; ud.last_level = 0;
if (!Bstrcasecmp(ud.rtsname,"DUKE.RTS") || if (g_rtsNamePtr == NULL &&
(!Bstrcasecmp(ud.rtsname,defaultrtsfilename) ||
!Bstrcasecmp(ud.rtsname,"WW2GI.RTS") || !Bstrcasecmp(ud.rtsname,"WW2GI.RTS") ||
!Bstrcasecmp(ud.rtsname,"NAM.RTS")) !Bstrcasecmp(ud.rtsname,"NAM.RTS")))
{ {
// ud.last_level is used as a flag here to reset the string to DUKE.RTS after load // ud.last_level is used as a flag here to reset the string to default after load
if (WW2GI) if (WW2GI)
ud.last_level = (Bstrcpy(ud.rtsname, "WW2GI.RTS") == ud.rtsname); ud.last_level = (Bstrcpy(ud.rtsname, "WW2GI.RTS") == ud.rtsname);
else if (NAM) else if (NAM)
ud.last_level = (Bstrcpy(ud.rtsname, "NAM.RTS") == ud.rtsname); ud.last_level = (Bstrcpy(ud.rtsname, "NAM.RTS") == ud.rtsname);
else else
ud.last_level = (Bstrcpy(ud.rtsname, "DUKE.RTS") == ud.rtsname); ud.last_level = (Bstrcpy(ud.rtsname, defaultrtsfilename) == ud.rtsname);
} }
RTS_Init(ud.rtsname); RTS_Init(ud.rtsname);
@ -10323,7 +10319,7 @@ CLEAN_DIRECTORY:
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, "DUKE.RTS"); Bstrcpy(ud.rtsname, defaultrtsfilename);
ud.last_level = -1; ud.last_level = -1;

1
polymer/eduke32/source/game.h
View file

@ -190,6 +190,7 @@ extern char CheatStrings[][MAXCHEATLEN];
extern char boardfilename[BMAX_PATH], currentboardfilename[BMAX_PATH]; extern char boardfilename[BMAX_PATH], currentboardfilename[BMAX_PATH];
extern char boardfilename[BMAX_PATH]; extern char boardfilename[BMAX_PATH];
extern char defaultduke3dgrp[BMAX_PATH]; extern char defaultduke3dgrp[BMAX_PATH];
extern char defaultrtsfilename[128];
extern char g_modDir[BMAX_PATH]; extern char g_modDir[BMAX_PATH];
extern char g_modDir[BMAX_PATH]; extern char g_modDir[BMAX_PATH];
extern char inputloc; extern char inputloc;