From 8c992647de71e03240dad0a6b2598dae3e81f1ec Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Sun, 30 Apr 2017 16:09:40 -0400 Subject: [PATCH] - fixed: "vid_renderer" should NEVER be referenced outside of the hardware code. This may fix a crash when changing modes with vid_renderer not matching actual renderer --- src/g_shared/a_dynlight.cpp | 4 ++-- src/p_3dfloors.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/g_shared/a_dynlight.cpp b/src/g_shared/a_dynlight.cpp index 4aaa75fa5..90e81d281 100644 --- a/src/g_shared/a_dynlight.cpp +++ b/src/g_shared/a_dynlight.cpp @@ -76,7 +76,7 @@ #include "gl/system//gl_interface.h" #include "vm.h" -EXTERN_CVAR(Int, vid_renderer) +extern int currentrenderer; CUSTOM_CVAR (Bool, gl_lights, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL) @@ -164,7 +164,7 @@ void ADynamicLight::BeginPlay() specialf1 = DAngle(double(SpawnAngle)).Normalized360().Degrees; visibletoplayer = true; - if (vid_renderer == 1 && gl.legacyMode && (flags4 & MF4_ATTENUATE)) + if (currentrenderer == 1 && gl.legacyMode && (flags4 & MF4_ATTENUATE)) { args[LIGHT_INTENSITY] = args[LIGHT_INTENSITY] * 2 / 3; args[LIGHT_SECONDARY_INTENSITY] = args[LIGHT_SECONDARY_INTENSITY] * 2 / 3; diff --git a/src/p_3dfloors.cpp b/src/p_3dfloors.cpp index 509efa822..66ab0d7c8 100644 --- a/src/p_3dfloors.cpp +++ b/src/p_3dfloors.cpp @@ -50,7 +50,7 @@ #include "g_levellocals.h" #include "actorinlines.h" -EXTERN_CVAR(Int, vid_renderer) +extern int currentrenderer; //========================================================================== // @@ -197,7 +197,7 @@ static void P_Add3DFloor(sector_t* sec, sector_t* sec2, line_t* master, int flag // kg3D - software renderer only hack // this is really required because of ceilingclip and floorclip - if((vid_renderer == 0) && (flags & FF_BOTHPLANES)) + if((currentrenderer == 0) && (flags & FF_BOTHPLANES)) { P_Add3DFloor(sec, sec2, master, FF_EXISTS | FF_THISINSIDE | FF_RENDERPLANES | FF_NOSHADE | FF_SEETHROUGH | FF_SHOOTTHROUGH | (flags & (FF_INVERTSECTOR | FF_TRANSLUCENT | FF_ADDITIVETRANS)), alpha);