diff options
| author | Nicola Mettifogo | 2009-03-23 20:41:54 +0000 |
|---|---|---|
| committer | Nicola Mettifogo | 2009-03-23 20:41:54 +0000 |
| commit | 2223627c7541651efd49f0718bbfe71a1625cee3 (patch) | |
| tree | e0ef02054a967b3ea4b733d75b30e32e2e517963 /engines/parallaction/input.cpp | |
| parent | 7f641cc6becc7481460d77c3e3b78a2eeb5788b0 (diff) | |
| download | scummvm-rg350-2223627c7541651efd49f0718bbfe71a1625cee3.tar.gz scummvm-rg350-2223627c7541651efd49f0718bbfe71a1625cee3.tar.bz2 scummvm-rg350-2223627c7541651efd49f0718bbfe71a1625cee3.zip | |
Merged GetData, HearData, SpeakData, PathData, ExamineData, MergeData into TypeData struct. This simplifies life a bit especially in the parsers.
svn-id: r39645
Diffstat (limited to 'engines/parallaction/input.cpp')
| -rw-r--r-- | engines/parallaction/input.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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); } |