Patch from Hendricks266 to add "-rts" command line parameter

git-svn-id: https://svn.eduke32.com/eduke32@1915 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2011-06-23 15:41:08 +00:00
parent 21297f8bcf
commit f339feb0ad

View file

@ -106,6 +106,7 @@ 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 +123,7 @@ char *g_grpNamePtr = defaultduke3dgrp;
char *g_defNamePtr = defsfilename; char *g_defNamePtr = defsfilename;
char *g_scriptNamePtr = defaultconfilename[0]; char *g_scriptNamePtr = defaultconfilename[0];
char *g_gameNamePtr = NULL; char *g_gameNamePtr = NULL;
char *g_rtsNamePtr = NULL;
extern int32_t lastvisinc; extern int32_t lastvisinc;
@ -7820,7 +7822,7 @@ static void G_ShowParameterHelp(void)
{ {
char *s = "Usage: eduke32 [files] [options]\n" char *s = "Usage: eduke32 [files] [options]\n"
"Example: eduke32 -q4 -a -m -tx -map nukeland.map\n\n" "Example: eduke32 -q4 -a -m -tx -map nukeland.map\n\n"
"Files can be *.grp/zip/con/def\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"
"-connect [host]\tConnect to a multiplayer game\n" "-connect [host]\tConnect to a multiplayer game\n"
@ -7833,6 +7835,7 @@ static void G_ShowParameterHelp(void)
"-map [file.map]\tLoads a map\n" "-map [file.map]\tLoads a map\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"
"-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"
@ -8498,6 +8501,19 @@ static void G_CheckCommandLine(int32_t argc, const char **argv)
i++; i++;
continue; continue;
} }
if (!Bstrcasecmp(c+1,"rts"))
{
if (argc > i+1)
{
Bstrcpy(ud.rtsname, (char *)argv[i+1]);
g_rtsNamePtr = (char *)argv[i+1];
g_skipDefaultRTS = 1;
initprintf("Using .RTS file '%s'\n",ud.rtsname);
i++;
}
i++;
continue;
}
if (!Bstrcasecmp(c+1,"condebug")) if (!Bstrcasecmp(c+1,"condebug"))
{ {
g_scriptDebug = 1; g_scriptDebug = 1;
@ -8780,6 +8796,14 @@ static void G_CheckCommandLine(int32_t argc, const char **argv)
initprintf("Using DEF file: %s.\n",g_defNamePtr); initprintf("Using DEF file: %s.\n",g_defNamePtr);
continue; continue;
} }
if (!Bstrcasecmp(k,".rts"))
{
g_rtsNamePtr = (char *)argv[i];
Bstrcpy(ud.rtsname, (char *)argv[i++]);
g_skipDefaultRTS = 1;
initprintf("Using .RTS file '%s'\n",ud.rtsname);
continue;
}
} }
} }
i++; i++;
@ -9570,6 +9594,10 @@ int32_t app_main(int32_t argc,const char **argv)
#endif #endif
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");