aboutsummaryrefslogtreecommitdiff
path: root/engines/agos/items.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'engines/agos/items.cpp')
-rw-r--r--engines/agos/items.cpp15
1 files changed, 11 insertions, 4 deletions
diff --git a/engines/agos/items.cpp b/engines/agos/items.cpp
index 446cf6385f..1ed4968854 100644
--- a/engines/agos/items.cpp
+++ b/engines/agos/items.cpp
@@ -311,6 +311,7 @@ void AGOSEngine::setupWaxworksOpcodes(OpcodeProc *op) {
setupAGOSOpcodes(op);
// Confirmed
+ op[55] = &AGOSEngine::oww_goto;
op[70] = &AGOSEngine::o1_printLongText;
op[83] = &AGOSEngine::o1_rescan;
op[98] = &AGOSEngine::o1_animate;
@@ -785,10 +786,6 @@ void AGOSEngine::o_random() {
void AGOSEngine::o_goto() {
// 55: set itemA parent
uint item = getNextItemID();
- if (_itemArrayPtr[item] == NULL) {
- setItemParent(me(), NULL);
- loadRoomItems(item);
- }
setItemParent(me(), _itemArrayPtr[item]);
}
@@ -1723,6 +1720,16 @@ void AGOSEngine::oe1_opcode178() {
// Waxworks Opcodes
// -----------------------------------------------------------------------
+void AGOSEngine::oww_goto() {
+ // 55: set itemA parent
+ uint item = getNextItemID();
+ if (_itemArrayPtr[item] == NULL) {
+ setItemParent(me(), NULL);
+ loadRoomItems(item);
+ }
+ setItemParent(me(), _itemArrayPtr[item]);
+}
+
void AGOSEngine::oww_whereTo() {
// 85: where to
Item *i = getNextItemPtr();