From f10c33ad0643c36f3a1fbe437856aa8f9058cd58 Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <sezeroz@gmail.com>
Date: Tue, 5 Jul 2022 10:10:00 +0300
Subject: [PATCH] re-diff'ed extra patches so that they apply cleanly

---
 Misc/fs_search_order.patch           |  6 +++---
 Misc/quake_retexturing_project.patch | 21 ++++++++++-----------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/Misc/fs_search_order.patch b/Misc/fs_search_order.patch
index 20a16ca8..0fba6a55 100644
--- a/Misc/fs_search_order.patch
+++ b/Misc/fs_search_order.patch
@@ -1,10 +1,10 @@
 allow plain files to override files inside a PAK file -- Sander van Dijk.
 
 diff --git a/Quake/common.c b/Quake/common.c
-index bd246f1..2326383 100644
+index eff4c30..1478d77 100644
 --- a/Quake/common.c
 +++ b/Quake/common.c
-@@ -2039,13 +2039,6 @@ static void COM_AddGameDirectory (const char *base, const char *dir)
+@@ -2030,13 +2030,6 @@ static void COM_AddGameDirectory (const char *base, const char *dir)
  	else	path_id = 1U;
  
  _add_path:
@@ -18,7 +18,7 @@ index bd246f1..2326383 100644
  	// add any pak files in the format pak0.pak pak1.pak, ...
  	for (i = 0; ; i++)
  	{
-@@ -2077,6 +2070,13 @@ _add_path:
+@@ -2068,6 +2061,13 @@ _add_path:
  		if (!pak) break;
  	}
  
diff --git a/Misc/quake_retexturing_project.patch b/Misc/quake_retexturing_project.patch
index ee37d293..907a5ca4 100644
--- a/Misc/quake_retexturing_project.patch
+++ b/Misc/quake_retexturing_project.patch
@@ -1,17 +1,17 @@
 diff --git a/Quake/gl_model.c b/Quake/gl_model.c
-index 94f0023..fdb8c4c 100644
+index d193051..783dc4d 100644
 --- a/Quake/gl_model.c
 +++ b/Quake/gl_model.c
-@@ -37,6 +37,8 @@ qmodel_t *Mod_LoadModel (qmodel_t *mod, qboolean crash);
- cvar_t	external_ents = {"external_ents", "1", CVAR_ARCHIVE};
- cvar_t	external_vis = {"external_vis", "1", CVAR_ARCHIVE};
+@@ -39,6 +39,8 @@ static void Mod_Print (void);
+ static cvar_t	external_ents = {"external_ents", "1", CVAR_ARCHIVE};
+ static cvar_t	external_vis = {"external_vis", "1", CVAR_ARCHIVE};
  
 +extern cvar_t	r_externaltexture_fix; //mk
 +
  static byte	*mod_novis;
  static int	mod_novis_capacity;
  
-@@ -534,6 +536,13 @@ void Mod_LoadTextures (lump_t *l)
+@@ -542,6 +544,13 @@ static void Mod_LoadTextures (lump_t *l)
  		{
  			if (!q_strncasecmp(tx->name,"sky",3)) //sky texture //also note -- was Q_strncmp, changed to match qbsp
  			{
@@ -23,9 +23,9 @@ index 94f0023..fdb8c4c 100644
 +					}
 +				}
  				if (loadmodel->bspversion == BSPVERSION_QUAKE64)
- 					Sky_LoadTextureQ64 (tx);
+ 					Sky_LoadTextureQ64 (loadmodel, tx);
  				else
-@@ -588,6 +597,50 @@ void Mod_LoadTextures (lump_t *l)
+@@ -596,6 +605,50 @@ static 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));
@@ -77,10 +77,10 @@ index 94f0023..fdb8c4c 100644
  				data = Image_LoadImage (filename, &fwidth, &fheight);
  				if (!data)
 diff --git a/Quake/gl_rmain.c b/Quake/gl_rmain.c
-index a41d8b1..b0020c5 100644
+index 332ab1e..783a9d6 100644
 --- a/Quake/gl_rmain.c
 +++ b/Quake/gl_rmain.c
-@@ -102,6 +102,8 @@ cvar_t	r_noshadow_list = {"r_noshadow_list", "progs/flame2.mdl,progs/flame.mdl,p
+@@ -99,6 +99,8 @@ cvar_t	r_noshadow_list = {"r_noshadow_list", "progs/flame2.mdl,progs/flame.mdl,p
  extern cvar_t	r_vfog;
  //johnfitz
  
@@ -90,7 +90,7 @@ index a41d8b1..b0020c5 100644
  
  cvar_t	r_lavaalpha = {"r_lavaalpha","0",CVAR_NONE};
 diff --git a/Quake/gl_rmisc.c b/Quake/gl_rmisc.c
-index dfdb84d..9c441bd 100644
+index dc3dff0..dbfe922 100644
 --- a/Quake/gl_rmisc.c
 +++ b/Quake/gl_rmisc.c
 @@ -47,6 +47,7 @@ extern cvar_t r_nolerp_list;
@@ -109,4 +109,3 @@ index dfdb84d..9c441bd 100644
  
  	Cvar_RegisterVariable (&gl_zfix); // QuakeSpasm z-fighting fix
  	Cvar_RegisterVariable (&r_lavaalpha);
-