From 1e7015643d1917d03c07525659264c26dd2a0f99 Mon Sep 17 00:00:00 2001 From: Magnus Norddahl Date: Sun, 15 Jan 2017 02:04:49 +0100 Subject: [PATCH] Remove ErrorCleanup from FRenderer interface --- src/d_main.cpp | 1 - src/r_renderer.h | 1 - src/swrenderer/r_swrenderer.cpp | 5 ----- src/swrenderer/r_swrenderer.h | 1 - src/swrenderer/scene/r_scene.cpp | 2 +- 5 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/d_main.cpp b/src/d_main.cpp index 887923260..2241c35c5 100644 --- a/src/d_main.cpp +++ b/src/d_main.cpp @@ -961,7 +961,6 @@ void D_ErrorCleanup () menuactive = MENU_Off; } insave = false; - Renderer->ErrorCleanup(); } //========================================================================== diff --git a/src/r_renderer.h b/src/r_renderer.h index 92ac3ef0c..d8f54ec5b 100644 --- a/src/r_renderer.h +++ b/src/r_renderer.h @@ -53,7 +53,6 @@ struct FRenderer virtual int GetMaxViewPitch(bool down) = 0; // return value is in plain degrees virtual void OnModeSet () {} - virtual void ErrorCleanup () {} virtual void ClearBuffer(int color) = 0; virtual void Init() = 0; virtual void SetWindow (int windowSize, int fullWidth, int fullHeight, int stHeight, float trueratio) {} diff --git a/src/swrenderer/r_swrenderer.cpp b/src/swrenderer/r_swrenderer.cpp index fff9a36f7..907b77051 100644 --- a/src/swrenderer/r_swrenderer.cpp +++ b/src/swrenderer/r_swrenderer.cpp @@ -276,11 +276,6 @@ void FSoftwareRenderer::OnModeSet () RenderScene::Instance()->ScreenResized(); } -void FSoftwareRenderer::ErrorCleanup () -{ - Clip3DFloors::Instance()->Cleanup(); -} - void FSoftwareRenderer::ClearBuffer(int color) { if (!r_swtruecolor) diff --git a/src/swrenderer/r_swrenderer.h b/src/swrenderer/r_swrenderer.h index 51d2b1d16..d116a1a95 100644 --- a/src/swrenderer/r_swrenderer.h +++ b/src/swrenderer/r_swrenderer.h @@ -31,7 +31,6 @@ struct FSoftwareRenderer : public FRenderer bool RequireGLNodes() override; void OnModeSet () override; - void ErrorCleanup () override; void ClearBuffer(int color) override; void Init() override; void SetWindow (int windowSize, int fullWidth, int fullHeight, int stHeight, float trueratio) override; diff --git a/src/swrenderer/scene/r_scene.cpp b/src/swrenderer/scene/r_scene.cpp index 54271d867..c9bfcb8bc 100644 --- a/src/swrenderer/scene/r_scene.cpp +++ b/src/swrenderer/scene/r_scene.cpp @@ -66,7 +66,7 @@ namespace swrenderer WallScanCycles.Reset(); Clip3DFloors *clip3d = Clip3DFloors::Instance(); - clip3d->fakeActive = false; // kg3D - reset fake floor indicator + clip3d->Cleanup(); clip3d->ResetClip(); // reset clips (floor/ceiling) R_SetupBuffer();