From 29a54c33b273666fdb127af3188b80512d28eab2 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Tue, 28 Aug 2018 20:25:07 +0200
Subject: [PATCH] - temporarily disabled wipe code and removed old function
 stubs.

This still needs work.

# Conflicts:
#	src/gl/data/gl_attributebuffer.cpp
---
 src/d_main.cpp        |  5 ++++-
 src/v_framebuffer.cpp | 25 -------------------------
 src/v_video.h         |  2 --
 3 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/src/d_main.cpp b/src/d_main.cpp
index 163ef9d64..980deaaa9 100644
--- a/src/d_main.cpp
+++ b/src/d_main.cpp
@@ -888,10 +888,12 @@ void D_Display ()
 		I_FreezeTime(true);
 		screen->End2D();
 		auto wipend = screen->WipeEndScreen ();
+		auto wiper = Wiper::Create(wipe_type);
 
 		wipestart = I_msTime();
 		NetUpdate();		// send out any new accumulation
 
+		/*
 		do
 		{
 			do
@@ -908,7 +910,8 @@ void D_Display ()
 			screen->End2DAndUpdate ();
 			NetUpdate ();			// [RH] not sure this is needed anymore
 		} while (!done);
-		screen->WipeCleanup();
+		*/
+		delete wiper;
 		I_FreezeTime(false);
 		GSnd->SetSfxPaused(false, 1);
 	}
diff --git a/src/v_framebuffer.cpp b/src/v_framebuffer.cpp
index d0eb961f6..0b1338d37 100644
--- a/src/v_framebuffer.cpp
+++ b/src/v_framebuffer.cpp
@@ -339,31 +339,6 @@ FTexture *DFrameBuffer::WipeEndScreen()
     return nullptr;
 }
 
-//==========================================================================
-//
-// DFrameBuffer :: WipeDo
-//
-// Draws one frame of a screenwipe. Should be called no more than 35
-// times per second. If called less than that, ticks indicates how many
-// ticks have passed since the last call.
-//
-//==========================================================================
-
-bool DFrameBuffer::WipeDo(int ticks)
-{
-	return false;
-}
-
-//==========================================================================
-//
-// DFrameBuffer :: WipeCleanup
-//
-//==========================================================================
-
-void DFrameBuffer::WipeCleanup()
-{
-}
-
 //==========================================================================
 //
 // DFrameBuffer :: InitPalette
diff --git a/src/v_video.h b/src/v_video.h
index f0dafa3ae..8fe4a2b2f 100644
--- a/src/v_video.h
+++ b/src/v_video.h
@@ -472,8 +472,6 @@ public:
 	// Screen wiping
 	virtual FTexture *WipeStartScreen();
 	virtual FTexture *WipeEndScreen();
-	virtual bool WipeDo(int ticks);
-	virtual void WipeCleanup();
 
 	virtual void PostProcessScene(int fixedcm, const std::function<void()> &afterBloomDrawEndScene2D) { if (afterBloomDrawEndScene2D) afterBloomDrawEndScene2D(); }