aboutsummaryrefslogtreecommitdiff
path: root/scumm/imuse_player.cpp
diff options
context:
space:
mode:
authorMax Horn2005-01-07 14:42:51 +0000
committerMax Horn2005-01-07 14:42:51 +0000
commit071b09cab4881287d702d45726438797b143f7d5 (patch)
tree9b1e407b1c31dd2b5aeb0a7d3effe1db952fc91b /scumm/imuse_player.cpp
parentb4d547c736d6c8718cdd1bc36aa4a2fc083b6c52 (diff)
downloadscummvm-rg350-071b09cab4881287d702d45726438797b143f7d5.tar.gz
scummvm-rg350-071b09cab4881287d702d45726438797b143f7d5.tar.bz2
scummvm-rg350-071b09cab4881287d702d45726438797b143f7d5.zip
Flag 64 bit problem in iMuse, as well as what I think might be very old regression in our code
svn-id: r16477
Diffstat (limited to 'scumm/imuse_player.cpp')
-rw-r--r--scumm/imuse_player.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/scumm/imuse_player.cpp b/scumm/imuse_player.cpp
index 712336e83d..444501af1f 100644
--- a/scumm/imuse_player.cpp
+++ b/scumm/imuse_player.cpp
@@ -951,7 +951,12 @@ int Player::query_part_param(int param, byte chan) {
case 15:
return part->_vol;
case 16:
- return (int)part->_instrument;
+// FIXME: Need to know where this occurs...
+error("Trying to cast instrument (%d, %d) -- please tell Fingolfin\n", param, chan);
+// In old versions of the code, this used to return part->_program.
+// This was changed in revision 2.29 of imuse.cpp (where this code used
+// to reside).
+// return (int)part->_instrument;
case 17:
return part->_transpose;
default: