aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorJonathan Gray2003-07-13 02:25:36 +0000
committerJonathan Gray2003-07-13 02:25:36 +0000
commit8e94094c9db1c4a302fed40a30eee85eb7b1bf55 (patch)
treef87529035da319b38fef04858566bc35d5ca88b4 /scumm
parenta87fd1011d0c17bade8a090826df4a9bded8e06b (diff)
downloadscummvm-rg350-8e94094c9db1c4a302fed40a30eee85eb7b1bf55.tar.gz
scummvm-rg350-8e94094c9db1c4a302fed40a30eee85eb7b1bf55.tar.bz2
scummvm-rg350-8e94094c9db1c4a302fed40a30eee85eb7b1bf55.zip
consistent case statement options, and make warnings more useful
svn-id: r8961
Diffstat (limited to 'scumm')
-rw-r--r--scumm/script_v5.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp
index 61fcca6e4b..3a217c65d1 100644
--- a/scumm/script_v5.cpp
+++ b/scumm/script_v5.cpp
@@ -1592,33 +1592,33 @@ void Scumm_v5::o5_resourceRoutines() {
loadFlObject(getVarOrDirectWord(0x40), resid);
break;
- case 0x1F + 1:
+ case 32:
// TODO
- warning("o5_resourceRoutines %d not yet handled (script %d)", _opcode, vm.slot[_currentScript].number);
+ warning("o5_resourceRoutines %d not yet handled (script %d)", _opcode & 0x3F, vm.slot[_currentScript].number);
break;
- case 0x20 + 1:
+ case 33:
// TODO
- warning("o5_resourceRoutines %d not yet handled (script %d)", _opcode, vm.slot[_currentScript].number);
+ warning("o5_resourceRoutines %d not yet handled (script %d)", _opcode & 0x3F, vm.slot[_currentScript].number);
break;
- case 0x22 + 1:
+ case 35:
// TODO
foo = getVarOrDirectByte(0x40);
- warning("o5_resourceRoutines %d not yet handled (script %d)", _opcode, vm.slot[_currentScript].number);
+ warning("o5_resourceRoutines %d not yet handled (script %d)", _opcode & 0x3F, vm.slot[_currentScript].number);
break;
- case 0x23 + 1:
+ case 36:
// TODO
foo = getVarOrDirectByte(0x40);
bar = fetchScriptByte();
- warning("o5_resourceRoutines %d not yet handled (script %d)", _opcode, vm.slot[_currentScript].number);
+ warning("o5_resourceRoutines %d not yet handled (script %d)", _opcode & 0x3F, vm.slot[_currentScript].number);
break;
- case 0x24 + 1:
+ case 37:
// TODO
foo = getVarOrDirectByte(0x40);
- warning("o5_resourceRoutines %d not yet handled (script %d)", _opcode, vm.slot[_currentScript].number);
+ warning("o5_resourceRoutines %d not yet handled (script %d)", _opcode & 0x3F, vm.slot[_currentScript].number);
break;
default:
- warning("Unknown o5_resourceRoutines: %d", _opcode);
+ warning("Unknown o5_resourceRoutines: %d", _opcode & 0x3F);
break;
}
}