aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2006-11-23 06:50:44 +0000
committerEugene Sandulenko2006-11-23 06:50:44 +0000
commit8476b767f92dcd9b3a04a236ed4c8ec5efaa8a16 (patch)
tree90dc34c6332c1ca18df89bd8d4e225abf2cb9f1c
parent57ba5fc233e29909fa9f5d8bf5d298b7a49cc685 (diff)
downloadscummvm-rg350-8476b767f92dcd9b3a04a236ed4c8ec5efaa8a16.tar.gz
scummvm-rg350-8476b767f92dcd9b3a04a236ed4c8ec5efaa8a16.tar.bz2
scummvm-rg350-8476b767f92dcd9b3a04a236ed4c8ec5efaa8a16.zip
Fix crashes on unimplemented music/sfx in Amiga/Atari versions.
svn-id: r24769
-rw-r--r--engines/cine/script.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/engines/cine/script.cpp b/engines/cine/script.cpp
index b33b9fc3ba..8bcd9b78b1 100644
--- a/engines/cine/script.cpp
+++ b/engines/cine/script.cpp
@@ -1691,7 +1691,8 @@ void o1_loadMusic() {
debugC(5, kCineDebugScript, "Line: %d: loadMusic(%s)", _currentLine, param);
- if (g_cine->getPlatform() == Common::kPlatformAmiga) {
+ if (g_cine->getPlatform() == Common::kPlatformAmiga ||
+ g_cine->getPlatform() == Common::kPlatformAtariST) {
warning("STUB: o1_loadMusic");
return;
}
@@ -1748,6 +1749,12 @@ void o1_playSample() {
int16 volume = getNextWord();
uint16 flag = getNextWord();
+ if (g_cine->getPlatform() == Common::kPlatformAmiga ||
+ g_cine->getPlatform() == Common::kPlatformAtariST) {
+ warning("STUB: o1_playSample");
+ return;
+ }
+
if (volume > 63)
volume = 63;
if (volume < 0)