aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2003-05-28 11:56:50 +0000
committerTravis Howell2003-05-28 11:56:50 +0000
commit383918313d06b60ce0dbee77fa3478fe2908bc97 (patch)
tree6e93091831c06de7d78b40b7011b282c257c8bdb
parent40c698ef20f60c8c61c4de52c14c795c46dda0f2 (diff)
downloadscummvm-rg350-383918313d06b60ce0dbee77fa3478fe2908bc97.tar.gz
scummvm-rg350-383918313d06b60ce0dbee77fa3478fe2908bc97.tar.bz2
scummvm-rg350-383918313d06b60ce0dbee77fa3478fe2908bc97.zip
Treat AMI music resoucres in monkey2 for Amiga as ROL for now, to allow music playback
svn-id: r8046
-rw-r--r--scumm/imuse.cpp4
-rw-r--r--scumm/resource.cpp3
2 files changed, 7 insertions, 0 deletions
diff --git a/scumm/imuse.cpp b/scumm/imuse.cpp
index 446d7531b2..504af874e1 100644
--- a/scumm/imuse.cpp
+++ b/scumm/imuse.cpp
@@ -131,6 +131,8 @@ bool IMuseInternal::isMT32(int sound) {
switch (tag) {
case MKID('ADL '):
return false;
+ case MKID('AMI '):
+ return true;
case MKID('ROL '):
return true;
case MKID('GMD '):
@@ -158,6 +160,8 @@ bool IMuseInternal::isGM(int sound) {
switch (tag) {
case MKID('ADL '):
return false;
+ case MKID('AMI '):
+ return true; // Yeah... for our purposes, this is GM
case MKID('ROL '):
return true; // Yeah... for our purposes, this is GM
case MKID('GMD '):
diff --git a/scumm/resource.cpp b/scumm/resource.cpp
index ca0c100cfa..9c6228bf61 100644
--- a/scumm/resource.cpp
+++ b/scumm/resource.cpp
@@ -728,6 +728,9 @@ int Scumm::readSoundResource(int type, int idx) {
if (_use_adlib)
pri = 10;
break;
+ case MKID('AMI '):
+ pri = 3;
+ break;
case MKID('ROL '):
pri = 3;
break;