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

Host_Game_f(): simplify

Browse source 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@996 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
Ozkan Sezer 2014-09-08 14:29:12 +00:00
parent ee9f2c99de
commit 985a16ee15
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Quake/host_cmd.c
View file

@ -134,7 +134,7 @@ void Host_Game_f (void)
unsigned int path_id; unsigned int path_id;
searchpath_t *search = com_searchpaths; searchpath_t *search = com_searchpaths;
pack_t *pak; pack_t *pak;
char pakfile[MAX_OSPATH]; //FIXME: it's confusing to use this string for two different things char pakfile[MAX_OSPATH];
if (Cmd_Argc() > 1) if (Cmd_Argc() > 1)
{ {
@ -152,8 +152,7 @@ void Host_Game_f (void)
return; return;
} }
q_strlcpy (pakfile, va("%s/%s", com_basedir, p), sizeof(pakfile)); if (!q_strcasecmp(p, COM_SkipPath(com_gamedir))) //no change
if (!q_strcasecmp(pakfile, com_gamedir)) //no change
{ {
Con_Printf("\"game\" is already \"%s\"\n", COM_SkipPath(com_gamedir)); Con_Printf("\"game\" is already \"%s\"\n", COM_SkipPath(com_gamedir));
return; return;
@ -172,7 +171,7 @@ void Host_Game_f (void)
if (NumGames(com_searchpaths) > 1 + com_nummissionpacks) if (NumGames(com_searchpaths) > 1 + com_nummissionpacks)
KillGameDir(com_searchpaths); KillGameDir(com_searchpaths);
q_strlcpy (com_gamedir, pakfile, sizeof(com_gamedir)); q_strlcpy (com_gamedir, va("%s/%s", com_basedir, p), sizeof(com_gamedir));
if (q_strcasecmp(p, GAMENAME)) //game is not id1 if (q_strcasecmp(p, GAMENAME)) //game is not id1
{ {
@ -182,7 +181,7 @@ void Host_Game_f (void)
else path_id = 1U; else path_id = 1U;
search = (searchpath_t *) Z_Malloc(sizeof(searchpath_t)); search = (searchpath_t *) Z_Malloc(sizeof(searchpath_t));
search->path_id = path_id; search->path_id = path_id;
q_strlcpy (search->filename, pakfile, sizeof(search->filename)); q_strlcpy (search->filename, com_gamedir, sizeof(search->filename));
search->next = com_searchpaths; search->next = com_searchpaths;
com_searchpaths = search; com_searchpaths = search;