fte
/
quakespasm
mirror of https://github.com/Shpoike/Quakespasm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rediff the extra fs_search_order.patch so it applies cleanly. 

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1061 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
Ozkan Sezer 2014-09-22 09:40:25 +00:00
parent 25a04deb61
commit d7b79721aa
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Misc/fs_search_order.patch
View File

@ -2,9 +2,9 @@ allow plain files to override files inside a PAK file -- Sander van Dijk
Index: Quake/common.c Index: Quake/common.c
=================================================================== ===================================================================
--- Quake/common.c (revision 1013) --- Quake/common.c (revision 1060)
+++ Quake/common.c (working copy) +++ Quake/common.c (working copy)
@@ -1898,15 +1898,7 @@ static void COM_AddGameDirectory (const @@ -1900,15 +1900,7 @@ static void COM_AddGameDirectory (const
if (com_searchpaths) if (com_searchpaths)
path_id = com_searchpaths->path_id << 1; path_id = com_searchpaths->path_id << 1;
else path_id = 1U; else path_id = 1U;
@ -20,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++)
{ {
@@ -1938,6 +1930,13 @@ _add_path: @@ -1940,6 +1932,13 @@ _add_path:
if (!pak) break; if (!pak) break;
} }