aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBorja Lorente2016-08-09 13:06:42 +0200
committerBorja Lorente2016-08-19 16:29:15 +0200
commitfd601f016f952f0a1b7fb4170fa05293813e7da5 (patch)
tree4f5f1b1994630d0a24998e2a9122a9840fa14e5f
parent560185903cf13dbb91ce916dc7347cec6f968c12 (diff)
downloadscummvm-rg350-fd601f016f952f0a1b7fb4170fa05293813e7da5.tar.gz
scummvm-rg350-fd601f016f952f0a1b7fb4170fa05293813e7da5.tar.bz2
scummvm-rg350-fd601f016f952f0a1b7fb4170fa05293813e7da5.zip
MACVENTURE: Fix small if
-rw-r--r--engines/macventure/macventure.cpp3
-rw-r--r--engines/macventure/sound.cpp2
2 files changed, 2 insertions, 3 deletions
diff --git a/engines/macventure/macventure.cpp b/engines/macventure/macventure.cpp
index 37a57ca423..8b947d5790 100644
--- a/engines/macventure/macventure.cpp
+++ b/engines/macventure/macventure.cpp
@@ -205,7 +205,6 @@ Common::Error MacVentureEngine::run() {
if (_gameState == kGameStateWinnig || _gameState == kGameStateLosing) {
endGame();
- return Common::kNoError;
}
}
_gui->draw();
@@ -240,7 +239,6 @@ void MacVentureEngine::resetGui() {
updateExits();
}
-
void MacVentureEngine::requestQuit() {
// TODO: Display save game dialog and such
_gameState = kGameStateQuitting;
@@ -542,6 +540,7 @@ void MacVentureEngine::endGame() {
}
void MacVentureEngine::updateState(bool pause) {
+ _prepared = false;
runObjQueue();
printTexts();
playSounds(pause);
diff --git a/engines/macventure/sound.cpp b/engines/macventure/sound.cpp
index 785c83ee0b..ea3b2d94ee 100644
--- a/engines/macventure/sound.cpp
+++ b/engines/macventure/sound.cpp
@@ -39,7 +39,7 @@ SoundManager::SoundManager(MacVentureEngine *engine, Audio::Mixer *mixer) {
SoundManager::~SoundManager(){
if (_container)
- delete _container;
+ delete _container;
Common::HashMap<ObjID, SoundAsset*>::iterator it;
for (it = _assets.begin(); it != _assets.end(); it++) {