From 77f010d4d3e7de5eab71b5fe93983334462bf4df Mon Sep 17 00:00:00 2001 From: sezero Date: Mon, 22 Sep 2014 09:40:25 +0000 Subject: [PATCH] rediff the extra fs_search_order.patch so it applies cleanly. git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1061 af15c1b1-3010-417e-b628-4374ebc0bcbd --- quakespasm/Misc/fs_search_order.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/quakespasm/Misc/fs_search_order.patch b/quakespasm/Misc/fs_search_order.patch index 92c70cb4..8190142f 100644 --- a/quakespasm/Misc/fs_search_order.patch +++ b/quakespasm/Misc/fs_search_order.patch @@ -2,9 +2,9 @@ allow plain files to override files inside a PAK file -- Sander van Dijk Index: Quake/common.c =================================================================== ---- Quake/common.c (revision 1013) +--- Quake/common.c (revision 1060) +++ 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) path_id = com_searchpaths->path_id << 1; else path_id = 1U; @@ -20,7 +20,7 @@ Index: Quake/common.c // add any pak files in the format pak0.pak pak1.pak, ... for (i = 0; ; i++) { -@@ -1938,6 +1930,13 @@ _add_path: +@@ -1940,6 +1932,13 @@ _add_path: if (!pak) break; }