diff options
| author | Nicola Mettifogo | 2009-10-16 04:19:16 +0000 |
|---|---|---|
| committer | Nicola Mettifogo | 2009-10-16 04:19:16 +0000 |
| commit | c0a4881f5a3efd14a202447d17227a7fcc62c336 (patch) | |
| tree | 98b1c7bbda8053807a13241a0a74e27b09a8d87e | |
| parent | 7e154726ff2bf8aa5361682ae2b4d24192e50b67 (diff) | |
| download | scummvm-rg350-c0a4881f5a3efd14a202447d17227a7fcc62c336.tar.gz scummvm-rg350-c0a4881f5a3efd14a202447d17227a7fcc62c336.tar.bz2 scummvm-rg350-c0a4881f5a3efd14a202447d17227a7fcc62c336.zip | |
Start the correct music inside the Hot Sushi. This fixes the part of ticket 2879793 that is actually a bug.
svn-id: r45147
| -rw-r--r-- | engines/parallaction/exec_br.cpp | 8 | ||||
| -rw-r--r-- | engines/parallaction/sound_ns.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/engines/parallaction/exec_br.cpp b/engines/parallaction/exec_br.cpp index e351a5ab2f..a1e43dc077 100644 --- a/engines/parallaction/exec_br.cpp +++ b/engines/parallaction/exec_br.cpp @@ -279,11 +279,11 @@ DECLARE_COMMAND_OPCODE(give) { /* NOTE: the following code is disabled until I deal with _inventory and * _charInventories not being public */ -/* int item = ctxt._cmd->_object; + int item = ctxt._cmd->_object; int recipient = ctxt._cmd->_characterId; - _vm->_charInventories[recipient]->addItem(item); - _vm->_inventory->removeItem(item); -*/ +// _vm->_charInventories[recipient]->addItem(item); + _vm->dropItem(item); + } diff --git a/engines/parallaction/sound_ns.cpp b/engines/parallaction/sound_ns.cpp index 65ee75ed98..1fd627ce4b 100644 --- a/engines/parallaction/sound_ns.cpp +++ b/engines/parallaction/sound_ns.cpp @@ -319,7 +319,7 @@ void DosSoundMan_ns::playLocationMusic(const char *location) { } if (!scumm_stricmp(location, "night") || !scumm_stricmp(location, "intsushi")) { - setMusicFile("nuts"); + setMusicFile("soft"); playMusic(); debugC(2, kDebugExec, "changeLocation: started music 'soft'"); |