[Scummvm-cvs-logs] SF.net SVN: scummvm:[45147] scummvm/trunk/engines/parallaction

[peres001 at users.sourceforge.net]

Revision: 45147
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45147&view=rev
Author:   peres001
Date:     2009-10-16 04:19:16 +0000 (Fri, 16 Oct 2009)

Log Message:
-----------
Start the correct music inside the Hot Sushi. This fixes the part of ticket 2879793 that is actually a bug.

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/exec_br.cpp
    scummvm/trunk/engines/parallaction/sound_ns.cpp

Modified: scummvm/trunk/engines/parallaction/exec_br.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/exec_br.cpp	2009-10-16 03:50:54 UTC (rev 45146)
+++ scummvm/trunk/engines/parallaction/exec_br.cpp	2009-10-16 04:19:16 UTC (rev 45147)
@@ -279,11 +279,11 @@
 	/* 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);
+
 }
 
 

Modified: scummvm/trunk/engines/parallaction/sound_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/sound_ns.cpp	2009-10-16 03:50:54 UTC (rev 45146)
+++ scummvm/trunk/engines/parallaction/sound_ns.cpp	2009-10-16 04:19:16 UTC (rev 45147)
@@ -319,7 +319,7 @@
 	}
 
 	if (!scumm_stricmp(location, "night") || !scumm_stricmp(location, "intsushi")) {
-		setMusicFile("nuts");
+		setMusicFile("soft");
 		playMusic();
 
 		debugC(2, kDebugExec, "changeLocation: started music 'soft'");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.