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/simon.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/simon.cpp')
-rw-r--r-- | engines/simon/simon.cpp | 42 |
1 files changed, 22 insertions, 20 deletions
diff --git a/engines/simon/simon.cpp b/engines/simon/simon.cpp index 1aa1735a2b..0e585df82f 100644 --- a/engines/simon/simon.cpp +++ b/engines/simon/simon.cpp @@ -280,7 +280,7 @@ SimonEngine::SimonEngine(OSystem *syst) _subjectItem = 0; _objectItem = 0; - _item1 = 0; + _currentPlayer = 0; _currentBoxNumber = 0; _iOverflow = 0; @@ -804,15 +804,15 @@ void SimonEngine::setUserFlag(Item *item, int a, int b) { void SimonEngine::createPlayer() { Child *child; - _item1 = _itemArrayPtr[1]; - _item1->adjective = -1; - _item1->noun = 10000; + _currentPlayer = _itemArrayPtr[1]; + _currentPlayer->adjective = -1; + _currentPlayer->noun = 10000; - child = (Child *)allocateChildBlock(_item1, 3, sizeof(Child)); + child = (Child *)allocateChildBlock(_currentPlayer, 3, sizeof(Child)); if (child == NULL) error("player create failure"); - setUserFlag(_item1, 0, 0); + setUserFlag(_currentPlayer, 0, 0); } void SimonEngine::allocateStringTable(int num) { @@ -1011,11 +1011,11 @@ Item *SimonEngine::getNextItemPtr() { case -3: return _objectItem; case -5: - return getItem1Ptr(); + return me(); case -7: - return getItemPtrB(); + return actor(); case -9: - return derefItem(getItem1Ptr()->parent); + return derefItem(me()->parent); default: return derefItem(a); } @@ -1051,20 +1051,22 @@ uint SimonEngine::getNextItemID() { case -7: return 0; case -9: - return getItem1Ptr()->parent; + return me()->parent; default: return a; } } -Item *SimonEngine::getItem1Ptr() { - if (_item1) - return _item1; +Item *SimonEngine::me() { + if (_currentPlayer) + return _currentPlayer; return _dummyItem1; } -Item *SimonEngine::getItemPtrB() { - error("getItemPtrB: is this code ever used?"); +Item *SimonEngine::actor() { + error("actor: is this code ever used?"); + //if (_actorPlayer) + // return _actorPlayer; return _dummyItem1; } @@ -2080,18 +2082,18 @@ void SimonEngine::handleVerbClicked(uint verb) { _objectItem = _hitAreaObjectItem; if (_objectItem == _dummyItem2) { - _objectItem = getItem1Ptr(); + _objectItem = me(); } if (_objectItem == _dummyItem3) { - _objectItem = derefItem(getItem1Ptr()->parent); + _objectItem = derefItem(me()->parent); } _subjectItem = _hitAreaSubjectItem; if (_subjectItem == _dummyItem2) { - _subjectItem = getItem1Ptr(); + _subjectItem = me(); } if (_subjectItem == _dummyItem3) { - _subjectItem = derefItem(getItem1Ptr()->parent); + _subjectItem = derefItem(me()->parent); } if (_subjectItem) { @@ -2817,7 +2819,7 @@ bool SimonEngine::itemIsSiblingOf(uint16 a) { if (item == NULL) return true; - return getItem1Ptr()->parent == item->parent; + return me()->parent == item->parent; } bool SimonEngine::itemIsParentOf(uint16 a, uint16 b) { |