diff options
author | Travis Howell | 2006-04-19 11:54:38 +0000 |
---|---|---|
committer | Travis Howell | 2006-04-19 11:54:38 +0000 |
commit | 18d0afaafd3f37c0013353d642baedf9141f7d38 (patch) | |
tree | 623040cd5a7d4b5a103edd049fac268d74ade0ad /engines/simon/items.cpp | |
parent | e97476621d6ed49edd11cca6150c034ee81ae8fe (diff) | |
download | scummvm-rg350-18d0afaafd3f37c0013353d642baedf9141f7d38.tar.gz scummvm-rg350-18d0afaafd3f37c0013353d642baedf9141f7d38.tar.bz2 scummvm-rg350-18d0afaafd3f37c0013353d642baedf9141f7d38.zip |
Correct dummyItems in FF and cleanup
svn-id: r22035
Diffstat (limited to 'engines/simon/items.cpp')
-rw-r--r-- | engines/simon/items.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/simon/items.cpp b/engines/simon/items.cpp index 7955a6b679..1e8e788aff 100644 --- a/engines/simon/items.cpp +++ b/engines/simon/items.cpp @@ -379,12 +379,12 @@ int SimonEngine::getScriptReturn() { void SimonEngine::o_at() { // 1: ptrA parent is - setScriptCondition(getItem1Ptr()->parent == getNextItemID()); + setScriptCondition(me()->parent == getNextItemID()); } void SimonEngine::o_notAt() { // 2: ptrA parent is not - setScriptCondition(getItem1Ptr()->parent != getNextItemID()); + setScriptCondition(me()->parent != getNextItemID()); } void SimonEngine::o_carried() { @@ -633,7 +633,7 @@ void SimonEngine::o_random() { void SimonEngine::o_goto() { // 55: set itemA parent - setItemParent(getItem1Ptr(), getNextItemPtr()); + setItemParent(me(), getNextItemPtr()); } void SimonEngine::o_oset() { @@ -1030,7 +1030,7 @@ void SimonEngine::o_defObj() { void SimonEngine::o_here() { // 125: item is sibling with item 1 Item *item = getNextItemPtr(); - setScriptCondition(getItem1Ptr()->parent == item->parent); + setScriptCondition(me()->parent == item->parent); } void SimonEngine::o_doClassIcons() { @@ -1340,10 +1340,10 @@ void SimonEngine::o_getDollar2() { _objectItem = _hitAreaObjectItem; if (_objectItem == _dummyItem2) - _objectItem = getItem1Ptr(); + _objectItem = me(); if (_objectItem == _dummyItem3) - _objectItem = derefItem(getItem1Ptr()->parent); + _objectItem = derefItem(me()->parent); if (_objectItem != NULL) { _scriptNoun2 = _objectItem->noun; @@ -1811,7 +1811,7 @@ void SimonEngine::o3_addTextBox() { h = getVarOrWord(); num = getVarOrByte(); if (num < _numTextBoxes) - defineBox(id, x, y, w, h, flags + (num << 8), 208, _dummyItem1); + defineBox(id, x, y, w, h, flags + (num << 8), 208, _dummyItem2); } void SimonEngine::o3_printLongText() { |