diff options
author | Johannes Schickel | 2005-12-14 14:08:30 +0000 |
---|---|---|
committer | Johannes Schickel | 2005-12-14 14:08:30 +0000 |
commit | df8e542f39463fac72e0688eb1a664621bfd4943 (patch) | |
tree | a5aa653e2d190691f18f75dc22ea101bdd440735 /kyra/kyra.cpp | |
parent | 25024e6943454e04aaedd4c8dd14b61a5cffba3c (diff) | |
download | scummvm-rg350-df8e542f39463fac72e0688eb1a664621bfd4943.tar.gz scummvm-rg350-df8e542f39463fac72e0688eb1a664621bfd4943.tar.bz2 scummvm-rg350-df8e542f39463fac72e0688eb1a664621bfd4943.zip |
Implemented command line update when picking up or dropping down items.
svn-id: r19798
Diffstat (limited to 'kyra/kyra.cpp')
-rw-r--r-- | kyra/kyra.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/kyra/kyra.cpp b/kyra/kyra.cpp index bbd9116ef2..87dcb23081 100644 --- a/kyra/kyra.cpp +++ b/kyra/kyra.cpp @@ -2993,7 +2993,8 @@ int KyraEngine::processItemDrop(uint16 sceneId, uint8 item, int x, int y, int un itemDropDown(x, y, destX, destY, freeItem, item); if (unk1 == 0 && unk2 != 0) { - // XXX updateSentenceCommand + assert(_itemList && _droppedList); + updateSentenceCommand(_itemList[item], _droppedList[0], 179); } return 1; @@ -3013,7 +3014,8 @@ void KyraEngine::exchangeItemWithMouseItem(uint16 sceneId, int itemIndex) { // XXX snd_kyraPlaySound 53 setMouseItem(_itemInHand); - // XXX + assert(_itemList && _takenList); + updateSentenceCommand(_itemList[_itemInHand], _takenList[1], 179); _screen->showMouse(); clickEventHandler2(); } @@ -3170,9 +3172,11 @@ void KyraEngine::dropItem(int unk1, int item, int x, int y, int unk2) { return; // call kyraPlaySound(54) if (12 == countItemsInScene(_currentCharacter->sceneId)) { - // XXX drawSentenceCommand + assert(_noDropList); + drawSentenceCommand(_noDropList[0], 6); } else { - // XXX drawSentenceCommand + assert(_noDropList); + drawSentenceCommand(_noDropList[1], 6); } } @@ -4799,7 +4803,8 @@ int KyraEngine::processInputHelper(int xpos, int ypos) { int item2 = currentRoom->itemsTable[item]; currentRoom->itemsTable[item] = 0xFF; setMouseItem(item2); - // XXX updateSentenceCommand + assert(_itemList && _takenList); + updateSentenceCommand(_itemList[item2], _takenList[0], 179); _itemInHand = item2; _screen->showMouse(); clickEventHandler2(); |