fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2025-02-09 01:01:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

re-diff'ed extra patches under Misc/ so that they apply cleanly.

Browse source
This commit is contained in:
Ozkan Sezer 2021-09-03 11:01:24 +03:00
parent 0fc09fd95d
commit 2578b75200
2 changed files with 11 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 6206c3f..27833b8 100644 index bd246f1..2326383 100644
--- a/Quake/common.c --- a/Quake/common.c
+++ b/Quake/common.c +++ b/Quake/common.c
@@ -2037,13 +2037,6 @@ static void COM_AddGameDirectory (const char *base, const char *dir) @@ -2039,13 +2039,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 6206c3f..27833b8 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++)
{ {
@@ -2075,6 +2068,13 @@ _add_path: @@ -2077,6 +2070,13 @@ _add_path:
if (!pak) break; if (!pak) break;
} }

19
Misc/quake_retexturing_project.patch
View file

@ -1,5 +1,5 @@
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 2b15080..07ff6fd 100644 index 94f0023..fdb8c4c 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); @@ -37,6 +37,8 @@ qmodel_t *Mod_LoadModel (qmodel_t *mod, qboolean crash);
@ -11,24 +11,21 @@ index 2b15080..07ff6fd 100644
static byte *mod_novis; static byte *mod_novis;
static int mod_novis_capacity; static int mod_novis_capacity;
@@ -498,7 +500,16 @@ void Mod_LoadTextures (lump_t *l) @@ -534,6 +536,13 @@ 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 if (!q_strncasecmp(tx->name,"sky",3)) //sky texture //also note -- was Q_strncmp, changed to match qbsp
+ { {
+ if (r_externaltexture_fix.value) { //mk + if (r_externaltexture_fix.value) { //mk
+ if (strstr(tx->name,"sky4")) { + if (strstr(tx->name,"sky4")) {
+ if (CRC_Block((byte *)(tx+1), tx->width * tx->height)==13039) + if (CRC_Block((byte *)(tx+1), tx->width * tx->height)==13039)
+ q_strlcpy(tx->name, "sky1", sizeof(tx->name)); + q_strlcpy(tx->name, "sky1", sizeof(tx->name));
+ Con_Printf(" using %s\n", tx->name); + Con_Printf(" using %s\n", tx->name);
+ } + }
+ } + }
Sky_LoadTexture (tx); if (loadmodel->bspversion == BSPVERSION_QUAKE64)
+ } Sky_LoadTextureQ64 (tx);
else if (tx->name[0] == '*') //warping texture else
{ @@ -588,6 +597,50 @@ void Mod_LoadTextures (lump_t *l)
//external textures -- first look in "textures/mapname/" then look in "textures/"
@@ -548,6 +559,50 @@ 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));