diff --git a/src/hwrenderer/scene/hw_fakeflat.cpp b/src/hwrenderer/scene/hw_fakeflat.cpp
index e4e986ca8b..c68677b138 100644
--- a/src/hwrenderer/scene/hw_fakeflat.cpp
+++ b/src/hwrenderer/scene/hw_fakeflat.cpp
@@ -392,15 +392,16 @@ sector_t * hw_FakeFlat(sector_t * sec, sector_t * dest, area_t in_area, bool bac
 //-----------------------------------------------------------------------------
 void HWDrawInfo::SetViewArea()
 {
+    auto &vp = r_viewpoint;
 	// The render_sector is better suited to represent the current position in GL
-	r_viewpoint.sector = R_PointInSubsector(r_viewpoint.Pos)->render_sector;
+	vp.sector = R_PointInSubsector(vp.Pos)->render_sector;
 
 	// Get the heightsec state from the render sector, not the current one!
-	if (r_viewpoint.sector->GetHeightSec())
+	if (vp.sector->GetHeightSec())
 	{
-		in_area = r_viewpoint.Pos.Z <= r_viewpoint.sector->heightsec->floorplane.ZatPoint(r_viewpoint.Pos) ? area_below :
-			(r_viewpoint.Pos.Z > r_viewpoint.sector->heightsec->ceilingplane.ZatPoint(r_viewpoint.Pos) &&
-				!(r_viewpoint.sector->heightsec->MoreFlags&SECMF_FAKEFLOORONLY)) ? area_above : area_normal;
+		in_area = vp.Pos.Z <= vp.sector->heightsec->floorplane.ZatPoint(vp.Pos) ? area_below :
+			(vp.Pos.Z > vp.sector->heightsec->ceilingplane.ZatPoint(vp.Pos) &&
+				!(vp.sector->heightsec->MoreFlags&SECMF_FAKEFLOORONLY)) ? area_above : area_normal;
 	}
 	else
 	{