- temporarily disabled wipe code and removed old function stubs.

This still needs work.

# Conflicts:
#	src/gl/data/gl_attributebuffer.cpp
This commit is contained in:
Christoph Oelckers 2018-08-28 20:25:07 +02:00
parent e4a40c98ce
commit 29a54c33b2
3 changed files with 4 additions and 28 deletions

View file

@ -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);
}

View file

@ -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

View file

@ -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(); }