aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorRobert Göffringmann2007-03-18 16:50:39 +0000
committerRobert Göffringmann2007-03-18 16:50:39 +0000
commitedd4e73787da08966b9d6453f16c96a8964c592d (patch)
tree6ddbe7975032b909d2f366f97b7be69a16468bc3 /engines
parentc7c79e33db1a94e950a076b75a89fb8dd41ffc22 (diff)
downloadscummvm-rg350-edd4e73787da08966b9d6453f16c96a8964c592d.tar.gz
scummvm-rg350-edd4e73787da08966b9d6453f16c96a8964c592d.tar.bz2
scummvm-rg350-edd4e73787da08966b9d6453f16c96a8964c592d.zip
minor cleanup
svn-id: r26212
Diffstat (limited to 'engines')
-rw-r--r--engines/sword1/logic.cpp2
-rw-r--r--engines/sword1/sound.cpp4
2 files changed, 1 insertions, 5 deletions
diff --git a/engines/sword1/logic.cpp b/engines/sword1/logic.cpp
index 105646cb5f..f0c4f18cc5 100644
--- a/engines/sword1/logic.cpp
+++ b/engines/sword1/logic.cpp
@@ -1633,7 +1633,7 @@ int Logic::fnQuitGame(Object *cpt, int32 id, int32 a, int32 b, int32 c, int32 d,
SwordEngine::_systemVars.engineQuit = true;
} else
error("fnQuitGame() called");
- return SCRIPT_STOP;
+ return fnQuit(cpt, id, 0, 0, 0, 0, 0, 0);;
}
int Logic::fnDeathScreen(Object *cpt, int32 id, int32 a, int32 b, int32 c, int32 d, int32 z, int32 x) {
diff --git a/engines/sword1/sound.cpp b/engines/sword1/sound.cpp
index 6c255cb4ce..35130c89c1 100644
--- a/engines/sword1/sound.cpp
+++ b/engines/sword1/sound.cpp
@@ -69,10 +69,6 @@ int Sound::addToQueue(int32 fxNo) {
warning("Sound queue overflow");
return 0;
}
- if ((fxNo == 168) && (SwordEngine::_systemVars.isDemo)) {
- // this sound doesn't exist in demo
- return 0;
- }
_resMan->resOpen(_fxList[fxNo].sampleId);
_fxQueue[_endOfQueue].id = fxNo;
if (_fxList[fxNo].type == FX_SPOT)