fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2025-02-09 09:10:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

improve mission pack loading from cmdline and via the 'game' command:

Browse source 
interpret -missionpack and [-]game missionpack as the same as a new
QuakeSpasm extension.  besides, do not let loading of the mission pack
directory twice.


git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1011 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
Ozkan Sezer 2014-09-09 10:12:30 +00:00
parent ae876c943b
commit 596628530b
1 changed files with 36 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
Quake/common.c
View file

@ -1975,8 +1975,13 @@ static void COM_Game_f (void)
if (!q_strcasecmp(p, COM_SkipPath(com_gamedir))) //no change if (!q_strcasecmp(p, COM_SkipPath(com_gamedir))) //no change
{ {
if (com_searchpaths->path_id > 1) { //current game not id1 if (com_searchpaths->path_id > 1) { //current game not id1
if (*p2 && com_searchpaths->path_id == 2) if (*p2 && com_searchpaths->path_id == 2) {
// rely on QuakeSpasm extension treating '-game missionpack'
// as '-missionpack', otherwise would be a mess
if (!q_strcasecmp(p, &p2[1]))
goto _same;
Con_Printf("reloading game \"%s\" with \"%s\" support\n", p, &p2[1]); Con_Printf("reloading game \"%s\" with \"%s\" support\n", p, &p2[1]);
}
else if (!*p2 && com_searchpaths->path_id > 2) else if (!*p2 && com_searchpaths->path_id > 2)
Con_Printf("reloading game \"%s\" without mission pack support\n", p); Con_Printf("reloading game \"%s\" without mission pack support\n", p);
else goto _same; else goto _same;
@ -2022,9 +2027,22 @@ static void COM_Game_f (void)
hipnotic = true; hipnotic = true;
else if (!strcmp(p2,"-rogue")) else if (!strcmp(p2,"-rogue"))
rogue = true; rogue = true;
} if (q_strcasecmp(p, &p2[1])) //don't load twice
COM_AddGameDirectory (com_basedir, p); COM_AddGameDirectory (com_basedir, p);
} }
else {
COM_AddGameDirectory (com_basedir, p);
// QuakeSpasm extension: treat '-game missionpack' as '-missionpack'
if (!q_strcasecmp(p,"hipnotic") || !q_strcasecmp(p,"quoth")) {
hipnotic = true;
standard_quake = false;
}
else if (!q_strcasecmp(p,"rogue")) {
rogue = true;
standard_quake = false;
}
}
}
else // just update com_gamedir else // just update com_gamedir
{ {
q_snprintf (com_gamedir, sizeof(com_gamedir), "%s/%s", q_snprintf (com_gamedir, sizeof(com_gamedir), "%s/%s",
@ -2103,7 +2121,22 @@ void COM_InitFilesystem (void) //johnfitz -- modified based on topaz's tutorial
if (!strcmp(p, ".") || strstr(p, "..") || strstr(p, "/") || strstr(p, "\\") || strstr(p, ":")) if (!strcmp(p, ".") || strstr(p, "..") || strstr(p, "/") || strstr(p, "\\") || strstr(p, ":"))
Sys_Error ("gamedir should be a single directory name, not a path\n"); Sys_Error ("gamedir should be a single directory name, not a path\n");
com_modified = true; com_modified = true;
// don't load mission packs twice
if (COM_CheckParm ("-rogue") && !q_strcasecmp(p, "rogue")) p = NULL;
if (COM_CheckParm ("-hipnotic") && !q_strcasecmp(p, "hipnotic")) p = NULL;
if (COM_CheckParm ("-quoth") && !q_strcasecmp(p, "quoth")) p = NULL;
if (p != NULL) {
COM_AddGameDirectory (com_basedir, p); COM_AddGameDirectory (com_basedir, p);
// QuakeSpasm extension: treat '-game missionpack' as '-missionpack'
if (!q_strcasecmp(p,"rogue")) {
rogue = true;
standard_quake = false;
}
if (!q_strcasecmp(p,"hipnotic") || !q_strcasecmp(p,"quoth")) {
hipnotic = true;
standard_quake = false;
}
}
} }
COM_CheckRegistered (); COM_CheckRegistered ();