[Scummvm-cvs-logs] SF.net SVN: scummvm:[49010] scummvm/trunk/engines/scumm

[Kirben at users.sourceforge.net]

Revision: 49010
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49010&view=rev
Author:   Kirben
Date:     2010-05-12 05:01:58 +0000 (Wed, 12 May 2010)

Log Message:
-----------
Fix missing songs in the HE73 version of Putt-Putt Saves the Zoo.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/he/intern_he.h
    scummvm/trunk/engines/scumm/scumm.cpp
    scummvm/trunk/engines/scumm/vars.cpp

Modified: scummvm/trunk/engines/scumm/he/intern_he.h
===================================================================
--- scummvm/trunk/engines/scumm/he/intern_he.h	2010-05-12 01:22:37 UTC (rev 49009)
+++ scummvm/trunk/engines/scumm/he/intern_he.h	2010-05-12 05:01:58 UTC (rev 49010)
@@ -341,6 +341,8 @@
 	byte VAR_NUM_IMAGES;
 	byte VAR_NUM_CHARSETS;
 
+	byte VAR_SOUND_ENABLED;
+
 	byte VAR_POLYGONS_ONLY;
 
 	byte VAR_MOUSE_STATE;			// Used in checkExecVerbs();

Modified: scummvm/trunk/engines/scumm/scumm.cpp
===================================================================
--- scummvm/trunk/engines/scumm/scumm.cpp	2010-05-12 01:22:37 UTC (rev 49009)
+++ scummvm/trunk/engines/scumm/scumm.cpp	2010-05-12 05:01:58 UTC (rev 49010)
@@ -793,6 +793,7 @@
 	VAR_NUM_COSTUMES = 0xFF;
 	VAR_NUM_IMAGES = 0xFF;
 	VAR_NUM_CHARSETS = 0xFF;
+	VAR_SOUND_ENABLED = 0xFF;
 	VAR_POLYGONS_ONLY = 0xFF;
 	VAR_MOUSE_STATE = 0xFF;
 	VAR_PLATFORM = 0xFF;

Modified: scummvm/trunk/engines/scumm/vars.cpp
===================================================================
--- scummvm/trunk/engines/scumm/vars.cpp	2010-05-12 01:22:37 UTC (rev 49009)
+++ scummvm/trunk/engines/scumm/vars.cpp	2010-05-12 05:01:58 UTC (rev 49010)
@@ -296,6 +296,7 @@
 	VAR_POLYGONS_ONLY = 76;
 
 	if (_game.heversion <= 74) {
+		VAR_SOUND_ENABLED = 54;
 		VAR_NUM_SOUND_CHANNELS = 56;
 	}
 
@@ -654,6 +655,11 @@
 	VAR(VAR_NUM_CHARSETS) = _numCharsets - 1;
 	VAR(VAR_NUM_GLOBAL_OBJS) = _numGlobalObjects - 1;
 
+	if (_game.heversion <= 74) {
+		// Songs are disabled, if sound is disabled.
+		VAR(VAR_SOUND_ENABLED) = 1;
+	}
+
 	if (_game.heversion == 74) {
 		// Uses different values, compared to later HE80+ games.
 		if (_game.platform == Common::kPlatformMacintosh) {


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