fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2024-11-10 07:21:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

make Sander's FS search patch compatible with on-the-fly gamedir changing

Browse source 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1000 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
Ozkan Sezer 2014-09-08 18:47:50 +00:00
parent 553a640f35
commit 9a10e67094
1 changed files with 35 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
Misc/fs_search_order.patch
View file

@ -1,10 +1,12 @@
allow plain files to override files inside a PAK file -- Sander van Dijk allow plain files to override files inside a PAK file -- Sander van Dijk
might not be compatible with the homedir patch yet -- O.S.
Index: Quake/common.c Index: Quake/common.c
=================================================================== ===================================================================
--- Quake/common.c (revision 993) --- Quake/common.c (revision 998)
+++ Quake/common.c (working copy) +++ Quake/common.c (working copy)
@@ -1927,13 +1927,6 @@ static void COM_AddGameDirectory (const @@ -1926,13 +1926,6 @@ static void COM_AddGameDirectory (const
path_id = com_searchpaths->path_id << 1; path_id = com_searchpaths->path_id << 1;
else path_id = 1U; else path_id = 1U;
@ -18,7 +20,7 @@ Index: Quake/common.c
// add any pak files in the format pak0.pak pak1.pak, ... // add any pak files in the format pak0.pak pak1.pak, ...
for (i = 0; ; i++) for (i = 0; ; i++)
{ {
@@ -1963,6 +1956,13 @@ static void COM_AddGameDirectory (const @@ -1962,6 +1955,13 @@ static void COM_AddGameDirectory (const
} }
if (!pak) break; if (!pak) break;
} }
@ -32,4 +34,34 @@ Index: Quake/common.c
} }
/* /*
Index: Quake/host_cmd.c
===================================================================
--- Quake/host_cmd.c (revision 998)
+++ Quake/host_cmd.c (working copy)
@@ -153,11 +153,6 @@ void Host_Game_f (void)
if (com_searchpaths)
path_id = com_searchpaths->path_id << 1;
else path_id = 1U;
- search = (searchpath_t *) Z_Malloc(sizeof(searchpath_t));
- search->path_id = path_id;
- q_strlcpy (search->filename, com_gamedir, sizeof(search->filename));
- search->next = com_searchpaths;
- com_searchpaths = search;
//Load the paks if any are found:
for (i = 0; ; i++)
@@ -172,6 +167,13 @@ void Host_Game_f (void)
search->next = com_searchpaths;
com_searchpaths = search;
}
+
+ // moved here from before the pakX.pak loop -- svdijk
+ search = (searchpath_t *) Z_Malloc(sizeof(searchpath_t));
+ search->path_id = path_id;
+ q_strlcpy (search->filename, com_gamedir, sizeof(search->filename));
+ search->next = com_searchpaths;
+ com_searchpaths = search;
}
//clear out and reload appropriate data