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-diff'ed extra patches so that they apply cleanly

Browse source
This commit is contained in:
Ozkan Sezer 2022-07-05 10:10:00 +03:00
parent 00530bda9b
commit f10c33ad06
2 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Misc/fs_search_order.patch
View file

@ -1,10 +1,10 @@
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.
diff --git a/Quake/common.c b/Quake/common.c diff --git a/Quake/common.c b/Quake/common.c
index bd246f1..2326383 100644 index eff4c30..1478d77 100644
--- a/Quake/common.c --- a/Quake/common.c
+++ b/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; else path_id = 1U;
_add_path: _add_path:
@ -18,7 +18,7 @@ index bd246f1..2326383 100644
// 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++)
{ {
@@ -2077,6 +2070,13 @@ _add_path: @@ -2068,6 +2061,13 @@ _add_path:
if (!pak) break; if (!pak) break;
} }

21
Misc/quake_retexturing_project.patch
View file

@ -1,17 +1,17 @@
diff --git a/Quake/gl_model.c b/Quake/gl_model.c 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 --- a/Quake/gl_model.c
+++ b/Quake/gl_model.c +++ b/Quake/gl_model.c
@@ -37,6 +37,8 @@ qmodel_t *Mod_LoadModel (qmodel_t *mod, qboolean crash); @@ -39,6 +39,8 @@ static void Mod_Print (void);
cvar_t external_ents = {"external_ents", "1", CVAR_ARCHIVE}; static cvar_t external_ents = {"external_ents", "1", CVAR_ARCHIVE};
cvar_t external_vis = {"external_vis", "1", CVAR_ARCHIVE}; static cvar_t external_vis = {"external_vis", "1", CVAR_ARCHIVE};
+extern cvar_t r_externaltexture_fix; //mk +extern cvar_t r_externaltexture_fix; //mk
+ +
static byte *mod_novis; static byte *mod_novis;
static int mod_novis_capacity; 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 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) if (loadmodel->bspversion == BSPVERSION_QUAKE64)
Sky_LoadTextureQ64 (tx); Sky_LoadTextureQ64 (loadmodel, tx);
else 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/" //external textures -- first look in "textures/mapname/" then look in "textures/"
mark = Hunk_LowMark (); mark = Hunk_LowMark ();
COM_StripExtension (loadmodel->name + 5, mapname, sizeof(mapname)); COM_StripExtension (loadmodel->name + 5, mapname, sizeof(mapname));
@ -77,10 +77,10 @@ index 94f0023..fdb8c4c 100644
data = Image_LoadImage (filename, &fwidth, &fheight); data = Image_LoadImage (filename, &fwidth, &fheight);
if (!data) if (!data)
diff --git a/Quake/gl_rmain.c b/Quake/gl_rmain.c 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 --- a/Quake/gl_rmain.c
+++ b/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; extern cvar_t r_vfog;
//johnfitz //johnfitz
@ -90,7 +90,7 @@ index a41d8b1..b0020c5 100644
cvar_t r_lavaalpha = {"r_lavaalpha","0",CVAR_NONE}; cvar_t r_lavaalpha = {"r_lavaalpha","0",CVAR_NONE};
diff --git a/Quake/gl_rmisc.c b/Quake/gl_rmisc.c 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 --- a/Quake/gl_rmisc.c
+++ b/Quake/gl_rmisc.c +++ b/Quake/gl_rmisc.c
@@ -47,6 +47,7 @@ extern cvar_t r_nolerp_list; @@ -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 (&gl_zfix); // QuakeSpasm z-fighting fix
Cvar_RegisterVariable (&r_lavaalpha); Cvar_RegisterVariable (&r_lavaalpha);