From 3008072807d08bff1193bba1a103d5cb6f1bb1d2 Mon Sep 17 00:00:00 2001 From: Spoike Date: Mon, 26 Oct 2020 11:48:50 +0000 Subject: [PATCH] Fix some stupid bugs. git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5781 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/client/r_surf.c | 2 ++ engine/client/renderer.c | 3 ++- engine/common/com_mesh.c | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/engine/client/r_surf.c b/engine/client/r_surf.c index b183497ea..594864c6b 100644 --- a/engine/client/r_surf.c +++ b/engine/client/r_surf.c @@ -30,6 +30,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #if (defined(GLQUAKE) || defined(VKQUAKE)) && defined(MULTITHREAD) #define THREADEDWORLD int webo_blocklightmapupdates; //0 no webo, &1=using threadedworld, &2=already uploaded. so update when !=3 +#else +#define webo_blocklightmapupdates 0 #endif #ifdef BEF_PUSHDEPTH qboolean r_pushdepth; diff --git a/engine/client/renderer.c b/engine/client/renderer.c index 398c93d3d..56b03c92b 100644 --- a/engine/client/renderer.c +++ b/engine/client/renderer.c @@ -229,7 +229,7 @@ cvar_t r_menutint = CVARF ("r_menutint", "0.68 0.4 0.13", CVAR_RENDERERCALLBACK); cvar_t r_netgraph = CVARD ("r_netgraph", "0", "Displays a graph of packet latency. A value of 2 will give additional info about what sort of data is being received from the server."); extern cvar_t r_lerpmuzzlehack; -extern cvar_t mod_h2holey_bugged, mod_halftexel; +extern cvar_t mod_h2holey_bugged, mod_halftexel, mod_nomipmap; cvar_t r_nolerp = CVARF ("r_nolerp", "0", CVAR_ARCHIVE); cvar_t r_noframegrouplerp = CVARF ("r_noframegrouplerp", "0", CVAR_ARCHIVE); cvar_t r_nolightdir = CVARF ("r_nolightdir", "0", CVAR_ARCHIVE); @@ -583,6 +583,7 @@ void GLRenderer_Init(void) #ifdef MD1MODELS Cvar_Register (&mod_h2holey_bugged, GLRENDEREROPTIONS); Cvar_Register (&mod_halftexel, GLRENDEREROPTIONS); + Cvar_Register (&mod_nomipmap, GLRENDEREROPTIONS); #endif Cvar_Register (&r_lerpmuzzlehack, GLRENDEREROPTIONS); Cvar_Register (&r_noframegrouplerp, GLRENDEREROPTIONS); diff --git a/engine/common/com_mesh.c b/engine/common/com_mesh.c index b033fa340..4cd82b485 100644 --- a/engine/common/com_mesh.c +++ b/engine/common/com_mesh.c @@ -3151,8 +3151,10 @@ void Mod_LoadAliasShaders(model_t *mod) if (!ruleset_allow_sensitive_texture_replacements.ival) imageflags |= IF_NOREPLACE; } +#ifdef MD1MODELS if (mod->fromgame == fg_quake && mod_nomipmap.ival) imageflags |= IF_NOMIPMAP; +#endif slash = COM_SkipPath(mod->name); if (slash != mod->name && slash-mod->name < sizeof(alttexpath))