aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engines/tony/game.cpp6
-rw-r--r--engines/tony/game.h3
2 files changed, 7 insertions, 2 deletions
diff --git a/engines/tony/game.cpp b/engines/tony/game.cpp
index dc5e412f00..a1954b95b2 100644
--- a/engines/tony/game.cpp
+++ b/engines/tony/game.cpp
@@ -139,6 +139,7 @@ RMOptionButton::RMOptionButton(const RMRect &pt) {
m_bActive = false;
m_bHasGfx = false;
m_bDoubleState = false;
+ m_buf = NULL;
}
RMOptionButton::~RMOptionButton() {
@@ -321,7 +322,7 @@ void RMOptionSlide::AddToList(RMGfxTargetBuffer &bigBuf) {
\****************************************************************************/
RMOptionScreen::RMOptionScreen(void) {
- m_nState = MENUGAME;
+ m_nState = MENUNONE;
m_menu = NULL;
m_HideLoadSave = NULL;
m_QuitConfirm = NULL;
@@ -379,6 +380,7 @@ RMOptionScreen::RMOptionScreen(void) {
RMOptionScreen::~RMOptionScreen(void) {
+ CloseState();
}
void RMOptionScreen::RefreshAll(CORO_PARAM) {
@@ -856,6 +858,8 @@ void RMOptionScreen::CloseState(void) {
m_ButtonSound_SFXOn = NULL;
}
}
+
+ m_nState = MENUNONE;
}
void RMOptionScreen::ReInit(RMGfxTargetBuffer &bigBuf) {
diff --git a/engines/tony/game.h b/engines/tony/game.h
index 20b5f347bc..c920b88ee5 100644
--- a/engines/tony/game.h
+++ b/engines/tony/game.h
@@ -252,7 +252,8 @@ private:
MENUGFX,
MENUSOUND,
MENULOAD,
- MENUSAVE
+ MENUSAVE,
+ MENUNONE
};
STATE m_nState;