From 2223627c7541651efd49f0718bbfe71a1625cee3 Mon Sep 17 00:00:00 2001
From: Nicola Mettifogo
Date: Mon, 23 Mar 2009 20:41:54 +0000
Subject: Merged GetData, HearData, SpeakData, PathData, ExamineData, MergeData
 into TypeData struct. This simplifies life a bit especially in the parsers.

svn-id: r39645
---
 engines/parallaction/input.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'engines/parallaction/input.cpp')

diff --git a/engines/parallaction/input.cpp b/engines/parallaction/input.cpp
index 3fbd65d196..92f3f026d1 100644
--- a/engines/parallaction/input.cpp
+++ b/engines/parallaction/input.cpp
@@ -375,9 +375,9 @@ void Input::exitInventoryMode() {
 		ZonePtr z = _vm->hitZone(kZoneMerge, _activeItem._index, _vm->getInventoryItemIndex(pos));
 
 		if (z) {
-			_vm->dropItem(z->u.merge->_obj1);
-			_vm->dropItem(z->u.merge->_obj2);
-			_vm->addInventoryItem(z->u.merge->_obj3);
+			_vm->dropItem(z->u._mergeObj1);
+			_vm->dropItem(z->u._mergeObj2);
+			_vm->addInventoryItem(z->u._mergeObj3);
 			_vm->_cmdExec->run(z->_commands);
 		}
 
-- 
cgit v1.2.3