diff options
| author | Johannes Schickel | 2006-01-12 13:16:42 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2006-01-12 13:16:42 +0000 |
| commit | 2416254e494d93b52009548f940f7ca28bc4db6d (patch) | |
| tree | a817a40a50d3a8d1e8657958db5fe7f22c300057 /kyra/gui.cpp | |
| parent | b3826575393d324f703e733a99468b97ccc0456c (diff) | |
| download | scummvm-rg350-2416254e494d93b52009548f940f7ca28bc4db6d.tar.gz scummvm-rg350-2416254e494d93b52009548f940f7ca28bc4db6d.tar.bz2 scummvm-rg350-2416254e494d93b52009548f940f7ca28bc4db6d.zip | |
Implemented 'ingame' sound handling, and named the unknown opcodes from the cd version
and 'implemented' them.
svn-id: r19988
Diffstat (limited to 'kyra/gui.cpp')
| -rw-r--r-- | kyra/gui.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kyra/gui.cpp b/kyra/gui.cpp index 25b08b1b08..84b8df406e 100644 --- a/kyra/gui.cpp +++ b/kyra/gui.cpp @@ -45,12 +45,12 @@ int KyraEngine::buttonInventoryCallback(Button *caller) { uint8 inventoryItem = _currentCharacter->inventoryItems[itemOffset]; if (_itemInHand == -1) { if (inventoryItem == 0xFF) { - // snd_playSoundEffect(0x36); + snd_playSoundEffect(0x36); return 0; } else { _screen->hideMouse(); _screen->fillRect(_itemPosX[itemOffset], _itemPosY[itemOffset], _itemPosX[itemOffset] + 15, _itemPosY[itemOffset] + 15, 12); - // snd_playSoundEffect(0x35); + snd_playSoundEffect(0x35); setMouseItem(inventoryItem); updateSentenceCommand(_itemList[inventoryItem], _takenList[0], 179); _itemInHand = inventoryItem; @@ -59,7 +59,7 @@ int KyraEngine::buttonInventoryCallback(Button *caller) { } } else { if (inventoryItem != 0xFF) { - // snd_playSoundEffect(0x35); + snd_playSoundEffect(0x35); _screen->hideMouse(); _screen->fillRect(_itemPosX[itemOffset], _itemPosY[itemOffset], _itemPosX[itemOffset] + 15, _itemPosY[itemOffset] + 15, 12); _screen->drawShape(0, _shapes[220+_itemInHand], _itemPosX[itemOffset], _itemPosY[itemOffset], 0, 0); @@ -69,7 +69,7 @@ int KyraEngine::buttonInventoryCallback(Button *caller) { _currentCharacter->inventoryItems[itemOffset] = _itemInHand; _itemInHand = inventoryItem; } else { - // snd_playSoundEffect(0x32); + snd_playSoundEffect(0x32); _screen->hideMouse(); _screen->drawShape(0, _shapes[220+_itemInHand], _itemPosX[itemOffset], _itemPosY[itemOffset], 0, 0); _screen->setMouseCursor(1, 1, _shapes[4]); @@ -156,9 +156,9 @@ int KyraEngine::buttonAmuletCallback(Button *caller) { // do not check for item in hand again as in the original since some strings are missing // in the cd version if (_currentCharacter->sceneId >= 109 && _currentCharacter->sceneId <= 198) { - // XXX + snd_playWanderScoreViaMap(1, 0); seq_makeBrandonWisp(); - // XXX + snd_playWanderScoreViaMap(17, 0); } else { seq_makeBrandonWisp(); } |