zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-01-21 09:01:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Heretic underwater pic working

Browse source 
- fixed issues with destroying intermission screens.


SVN r2889 (finale)
This commit is contained in:
Christoph Oelckers 2010-10-03 18:34:31 +00:00
parent 7ef87064d7
commit fe1b4d2200
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/intermission/intermission.cpp
View file

@ -182,8 +182,10 @@ void DIntermissionScreen::Destroy()
palette[i] = GPalette.BaseColors[i]; palette[i] = GPalette.BaseColors[i];
} }
screen->UpdatePalette (); screen->UpdatePalette ();
NoWipe = 0; NoWipe = 5;
mPaletteChanged = false;
} }
Super::Destroy();
} }
//========================================================================== //==========================================================================
@ -443,7 +445,7 @@ bool DIntermissionController::NextPage ()
FTextureID bg; FTextureID bg;
bool fill = false; bool fill = false;
if (mIndex == (int)mDesc->mActions.Size()-1 && mDesc->mLink == NAME_None) if (mIndex == (int)mDesc->mActions.Size() && mDesc->mLink == NAME_None)
{ {
// last page // last page
return false; return false;
@ -537,6 +539,7 @@ void DIntermissionController::Destroy ()
Super::Destroy(); Super::Destroy();
if (mDeleteDesc) delete mDesc; if (mDeleteDesc) delete mDesc;
mDesc = NULL; mDesc = NULL;
if (CurrentIntermission == this) CurrentIntermission = NULL;
} }