aboutsummaryrefslogtreecommitdiff
path: root/engines/adl/adl_v5.cpp
diff options
context:
space:
mode:
authorWalter van Niftrik2016-12-11 16:45:54 +0100
committerWalter van Niftrik2016-12-11 16:51:14 +0100
commit64ff20acbc24b859ff2c66d0f58be900d302ca43 (patch)
tree32ea358dea23eae70bc6bea7b1969b1fc4a1a901 /engines/adl/adl_v5.cpp
parent0b6b5a34b0a9dec0bf71b877e552bbf9f2fa1245 (diff)
downloadscummvm-rg350-64ff20acbc24b859ff2c66d0f58be900d302ca43.tar.gz
scummvm-rg350-64ff20acbc24b859ff2c66d0f58be900d302ca43.tar.bz2
scummvm-rg350-64ff20acbc24b859ff2c66d0f58be900d302ca43.zip
ADL: Unify inventory opcodes
Diffstat (limited to 'engines/adl/adl_v5.cpp')
-rw-r--r--engines/adl/adl_v5.cpp14
1 files changed, 1 insertions, 13 deletions
diff --git a/engines/adl/adl_v5.cpp b/engines/adl/adl_v5.cpp
index cb416e1828..7e7c6e40ac 100644
--- a/engines/adl/adl_v5.cpp
+++ b/engines/adl/adl_v5.cpp
@@ -94,7 +94,7 @@ void AdlEngine_v5::setupOpcodeTables() {
Opcode(o1_varSub);
Opcode(o1_varSet);
// 0x04
- Opcode(o5_listInv);
+ Opcode(o1_listInv);
Opcode(o5_moveItem);
Opcode(o1_setRoom);
Opcode(o2_setCurPic);
@@ -183,18 +183,6 @@ int AdlEngine_v5::o5_isNounNotInRoom(ScriptEnv &e) {
return 1;
}
-int AdlEngine_v5::o5_listInv(ScriptEnv &e) {
- OP_DEBUG_0("\tLIST_INVENTORY()");
-
- Common::List<Item>::const_iterator item;
-
- for (item = _state.items.begin(); item != _state.items.end(); ++item)
- if (item->room == IDI_ANY)
- printString(_itemDesc[item->id - 1]);
-
- return 0;
-}
-
int AdlEngine_v5::o5_moveItem(ScriptEnv &e) {
OP_DEBUG_2("\tSET_ITEM_ROOM(%s, %s)", itemStr(e.arg(1)).c_str(), itemRoomStr(e.arg(2)).c_str());