Organise
This commit is contained in:
parent
16dafe52ae
commit
37679bb44e
24
src/f_wipe.c
24
src/f_wipe.c
|
@ -553,32 +553,40 @@ void F_RunWipe(UINT8 wipetype, boolean drawMenu)
|
||||||
I_Sleep();
|
I_Sleep();
|
||||||
lastwipetic = nowtime;
|
lastwipetic = nowtime;
|
||||||
|
|
||||||
|
// Wipe styles
|
||||||
|
if (wipestyle == WIPESTYLE_COLORMAP)
|
||||||
|
{
|
||||||
#ifdef HWRENDER
|
#ifdef HWRENDER
|
||||||
if (rendermode == render_opengl)
|
if (rendermode == render_opengl)
|
||||||
{
|
{
|
||||||
// send in the wipe type and wipe frame because we need to cache the graphic
|
// send in the wipe type and wipe frame because we need to cache the graphic
|
||||||
if (wipestyle == WIPESTYLE_COLORMAP)
|
|
||||||
HWR_DoTintedWipe(wipetype, wipeframe-1);
|
HWR_DoTintedWipe(wipetype, wipeframe-1);
|
||||||
else
|
|
||||||
HWR_DoWipe(wipetype, wipeframe-1);
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
{
|
|
||||||
if (wipestyle == WIPESTYLE_COLORMAP)
|
|
||||||
{
|
{
|
||||||
UINT8 *colormap = fadecolormap;
|
UINT8 *colormap = fadecolormap;
|
||||||
if (wipestyleflags & WSF_TOWHITE)
|
if (wipestyleflags & WSF_TOWHITE)
|
||||||
colormap += (FADECOLORMAPROWS * 256);
|
colormap += (FADECOLORMAPROWS * 256);
|
||||||
F_DoColormapWipe(fmask, colormap);
|
F_DoColormapWipe(fmask, colormap);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Draw the title card above the wipe
|
||||||
|
F_WipeStageTitle();
|
||||||
|
}
|
||||||
else
|
else
|
||||||
|
{
|
||||||
|
#ifdef HWRENDER
|
||||||
|
if (rendermode == render_opengl)
|
||||||
|
{
|
||||||
|
// send in the wipe type and wipe frame because we need to cache the graphic
|
||||||
|
HWR_DoWipe(wipetype, wipeframe-1);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
#endif
|
||||||
F_DoWipe(fmask);
|
F_DoWipe(fmask);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (wipestyle == WIPESTYLE_COLORMAP)
|
|
||||||
F_WipeStageTitle();
|
|
||||||
|
|
||||||
I_OsPolling();
|
I_OsPolling();
|
||||||
I_UpdateNoBlit();
|
I_UpdateNoBlit();
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue