From 0efa138cca9173f2440bc335d327890813329033 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Lu=C3=ADs=20Vaz=20Silva?= Date: Fri, 2 May 2025 17:19:07 -0300 Subject: [PATCH] fix up merge issues --- src/rendering/hwrenderer/scene/hw_drawinfo.cpp | 2 +- src/rendering/hwrenderer/scene/hw_flats.cpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/rendering/hwrenderer/scene/hw_drawinfo.cpp b/src/rendering/hwrenderer/scene/hw_drawinfo.cpp index d39aada25..d53bdd3aa 100644 --- a/src/rendering/hwrenderer/scene/hw_drawinfo.cpp +++ b/src/rendering/hwrenderer/scene/hw_drawinfo.cpp @@ -446,7 +446,7 @@ void HWDrawInfo::CreateScene(bool drawpsprites, FRenderState& state) { double a2 = 20.0 + 0.5*Viewpoint.FieldOfView.Degrees(); // FrustumPitch for vertical clipping if (a2 > 179.0) a2 = 179.0; - double pitchmult = !!(portalState.PlaneMirrorFlag & 1) ? -1.0 : 1.0; + double pitchmult = !!(drawctx->portalState.PlaneMirrorFlag & 1) ? -1.0 : 1.0; vClipper->SafeAddClipRangeDegPitches(pitchmult * vp.HWAngles.Pitch.Degrees() - a2, pitchmult * vp.HWAngles.Pitch.Degrees() + a2); // clip the suplex range Viewpoint.PitchSin *= pitchmult; } diff --git a/src/rendering/hwrenderer/scene/hw_flats.cpp b/src/rendering/hwrenderer/scene/hw_flats.cpp index 05f281b4e..e40eea761 100644 --- a/src/rendering/hwrenderer/scene/hw_flats.cpp +++ b/src/rendering/hwrenderer/scene/hw_flats.cpp @@ -48,7 +48,6 @@ #include "hw_renderstate.h" #include "texturemanager.h" #include "hw_flatdispatcher.h" -#include "hw_viewpointbuffer.h" EXTERN_CVAR(Bool, lm_dynlights);