-
Notifications
You must be signed in to change notification settings - Fork 98
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Quake Enhanced, Scourge of Armagon - missing texture #56
Comments
Reproduced with quake enhanced update3, hipnotic pak0.pak is 79,928,584 Possibly a missing texture - haven't investigated. How does ironwail or |
Same thing happens in vkquake for me |
And I assume this does not happen in the Kex Quake? |
No, it doesn't seem to happen, although it uses different texture than the retro SoA did: |
I'm getting a warning "Mod_LoadTexInfo: 12 textures missing from BSP file". Does not happen with the original hipnotic (non rerelease). After debugging for like 5 minutes I have no idea how this works in Kex Quake: The texture lump just has invalid (-1) dataofs entries. |
Can anything be done to fix this with an extra |
They probably use textures[0] for missed textures. --- a/Quake/gl_model.c
+++ b/Quake/gl_model.c
@@ -1052,10 +1052,9 @@ static void Mod_LoadTexinfo (lump_t *l)
if (miptex >= loadmodel->numtextures-1 || !loadmodel->textures[miptex])
{
if (out->flags & TEX_SPECIAL)
- out->texture = loadmodel->textures[loadmodel->numtextures-1];
+ out->texture = loadmodel->textures[0];
else
- out->texture = loadmodel->textures[loadmodel->numtextures-2];
- out->flags |= TEX_MISSING;
+ out->texture = loadmodel->textures[0];
missing++;
}
else |
Huh.. Thanks @andrey-budko. Now, if we had a fool-proof way of detecting rerelease content.. |
@Novum, @temx, @ericwa, @andrei-drexler: What do you think of this? |
I think we can ask @svkaiser |
FWIW, I can make a 'detection' (cough..) of remastered content like below. index c80450f..24781c3 100644
--- a/Quake/common.c
+++ b/Quake/common.c
@@ -39,6 +39,7 @@ cvar_t cmdline = {"cmdline","",CVAR_ROM/*|CVAR_SERVERINFO*/}; /* sending cmdline
static qboolean com_modified; // set true if using non-id files
qboolean fitzmode;
+qboolean remastered = false;
static void COM_Path_f (void);
@@ -2135,6 +2136,13 @@ _add_path:
search->next = com_searchpaths;
com_searchpaths = search;
}
+ if (i == 0 && path_id == 1) {
+ if (COM_FileExists("progs/b_g_key_00_00.lmp", NULL) &&
+ file_from_pak && com_filesize == 4104) {
+ remastered = true; /* 2021 re-release content */
+ Con_Printf ("Playing remastered version.\n");
+ }
+ }
if (qspak) {
search = (searchpath_t *) Z_Malloc(sizeof(searchpath_t));
search->path_id = path_id;
diff --git a/Quake/gl_model.c b/Quake/gl_model.c
index 46a83a9..0a9729c 100644
--- a/Quake/gl_model.c
+++ b/Quake/gl_model.c
@@ -1051,6 +1051,9 @@ static void Mod_LoadTexinfo (lump_t *l)
//johnfitz -- rewrote this section
if (miptex >= loadmodel->numtextures-1 || !loadmodel->textures[miptex])
{
+ if (remastered)
+ out->texture = loadmodel->textures[0];
+ else
if (out->flags & TEX_SPECIAL)
out->texture = loadmodel->textures[loadmodel->numtextures-1];
else
diff --git a/Quake/common.h b/Quake/common.h
index 05ff9d3..7694215 100644
--- a/Quake/common.h
+++ b/Quake/common.h
@@ -397,6 +397,7 @@ long FS_filelength (fshandle_t *fh);
extern struct cvar_s registered;
+extern qboolean remastered;
extern qboolean standard_quake, rogue, hipnotic;
extern qboolean fitzmode;
/* if true, run in fitzquake mode disabling custom quakespasm hacks */ |
Well, I wasn't expecting any solutions to this thing at all to begin with. I'm still not sure that your patch whether your patch can cause any |
Just in case you didn't notice. I'm not sure about my patch too. |
When playing Quake Enhanced, Scourge of Armagon, map
hip2m4
the end gate of the level has checkered/missing texture, as seen on the screenshot. Myhipnotic
'spak0.pak
md5sum isa9e2a6e544da7f506f6b65b0661e89a9
, I use GOG purchase of Quake Enhanced.https://imgur.com/1376s0r
The text was updated successfully, but these errors were encountered: