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

re-diffed two patches so that they apply cleanly

Browse source 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1494 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
Ozkan Sezer 2017-09-03 14:55:18 +00:00
parent 050283be01
commit 1edb1323ff
2 changed files with 9 additions and 9 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
===================================================================
--- Quake/common.c (revision 1280)
--- Quake/common.c (revision 1476)
+++ Quake/common.c (working copy)
@@ -1911,13 +1911,6 @@ static void COM_AddGameDirectory (const
@@ -2036,13 +2036,6 @@ static void COM_AddGameDirectory (const
else path_id = 1U;
_add_path:
@ -18,7 +18,7 @@ Index: Quake/common.c
// add any pak files in the format pak0.pak pak1.pak, ...
for (i = 0; ; i++)
{
@@ -1949,6 +1942,13 @@ _add_path:
@@ -2074,6 +2067,13 @@ _add_path:
if (!pak) break;
}

12
Misc/quake_retexturing_project.patch
View file

@ -1,9 +1,9 @@
Index: Quake/gl_model.c
===================================================================
--- Quake/gl_model.c (revision 1280)
--- Quake/gl_model.c (revision 1463)
+++ Quake/gl_model.c (working copy)
@@ -404,6 +404,8 @@ void Mod_LoadTextures (lump_t *l)
@@ -429,6 +429,8 @@ void Mod_LoadTextures (lump_t *l)
extern byte *hunk_base;
//johnfitz
@ -12,7 +12,7 @@ Index: Quake/gl_model.c
//johnfitz -- don't return early if no textures; still need to create dummy texture
if (!l->filelen)
{
@@ -465,7 +467,17 @@ void Mod_LoadTextures (lump_t *l)
@@ -490,7 +492,17 @@ void Mod_LoadTextures (lump_t *l)
if (!isDedicated) //no texture uploading for dedicated server
{
if (!q_strncasecmp(tx->name,"sky",3)) //sky texture //also note -- was Q_strncmp, changed to match qbsp
@ -30,7 +30,7 @@ Index: Quake/gl_model.c
else if (tx->name[0] == '*') //warping texture
{
//external textures -- first look in "textures/mapname/" then look in "textures/"
@@ -515,6 +527,52 @@ void Mod_LoadTextures (lump_t *l)
@@ -540,6 +552,52 @@ void Mod_LoadTextures (lump_t *l)
//external textures -- first look in "textures/mapname/" then look in "textures/"
mark = Hunk_LowMark ();
COM_StripExtension (loadmodel->name + 5, mapname, sizeof(mapname));
@ -85,7 +85,7 @@ Index: Quake/gl_model.c
if (!data)
Index: Quake/gl_rmain.c
===================================================================
--- Quake/gl_rmain.c (revision 1280)
--- Quake/gl_rmain.c (revision 1406)
+++ Quake/gl_rmain.c (working copy)
@@ -101,6 +101,8 @@
@ -98,7 +98,7 @@ Index: Quake/gl_rmain.c
Index: Quake/gl_rmisc.c
===================================================================
--- Quake/gl_rmisc.c (revision 1280)
--- Quake/gl_rmisc.c (revision 1406)
+++ Quake/gl_rmisc.c (working copy)
@@ -47,6 +47,7 @@
extern cvar_t r_noshadow_list;