[Scummvm-cvs-logs] SF.net SVN: scummvm:[55019] scummvm/trunk/engines/hugo

[strangerke at users.sourceforge.net]

Revision: 55019
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55019&view=rev
Author:   strangerke
Date:     2010-12-22 22:56:42 +0000 (Wed, 22 Dec 2010)

Log Message:
-----------
HUGO: Suppress some obsolete volume related variables

Modified Paths:
--------------
    scummvm/trunk/engines/hugo/game.h
    scummvm/trunk/engines/hugo/hugo.cpp
    scummvm/trunk/engines/hugo/sound.cpp

Modified: scummvm/trunk/engines/hugo/game.h
===================================================================
--- scummvm/trunk/engines/hugo/game.h	2010-12-22 22:25:52 UTC (rev 55018)
+++ scummvm/trunk/engines/hugo/game.h	2010-12-22 22:56:42 UTC (rev 55019)
@@ -777,9 +777,9 @@
 
 /**
 * Following is structure of verbs and nouns for 'background' objects
-*   These are objects that appear in the various screens, but nothing
-*   interesting ever happens with them.  Rather than just be dumb and say
-*   "don't understand" we produce an interesting msg to keep user sane.
+* These are objects that appear in the various screens, but nothing
+* interesting ever happens with them.  Rather than just be dumb and say
+* "don't understand" we produce an interesting msg to keep user sane.
 */
 struct background_t {
 	uint16 verbIndex;
@@ -849,10 +849,7 @@
 	bool musicFl;                                   // State of Music button/menu item
 	bool soundFl;                                   // State of Sound button/menu item
 	bool turboFl;                                   // State of Turbo button/menu item
-	bool  backgroundMusicFl;                        // Continue music when task inactive
-	byte  musicVolume;                              // Music volume percentage
-	byte  soundVolume;                              // Sound volume percentage
-	bool  playlist[MAX_TUNES];                      // Tune playlist
+	bool playlist[MAX_TUNES];                       // Tune playlist
 };
 
 struct target_t {                                   // Secondary target for action

Modified: scummvm/trunk/engines/hugo/hugo.cpp
===================================================================
--- scummvm/trunk/engines/hugo/hugo.cpp	2010-12-22 22:25:52 UTC (rev 55018)
+++ scummvm/trunk/engines/hugo/hugo.cpp	2010-12-22 22:56:42 UTC (rev 55019)
@@ -958,12 +958,8 @@
 		_config.musicFl = true;                     // Music state initially on
 		_config.soundFl = true;                     // Sound state initially on
 		_config.turboFl = false;                    // Turbo state initially off
-		_config.backgroundMusicFl = false;          // No music when inactive
-		_config.musicVolume = 85;                   // Music volume %
-		_config.soundVolume = 100;                  // Sound volume %
 		initPlaylist(_config.playlist);             // Initialize default tune playlist
-
-		_file->readBootFile();    // Read startup structure
+		_file->readBootFile();                      // Read startup structure
 		break;
 	case RESET:
 		// Find first tune and play it

Modified: scummvm/trunk/engines/hugo/sound.cpp
===================================================================
--- scummvm/trunk/engines/hugo/sound.cpp	2010-12-22 22:25:52 UTC (rev 55018)
+++ scummvm/trunk/engines/hugo/sound.cpp	2010-12-22 22:56:42 UTC (rev 55019)
@@ -240,7 +240,7 @@
 * Set the FM music volume from config.mvolume (0..100%)
 */
 void SoundHandler::setMusicVolume() {
-	_midiPlayer->setVolume(_config.musicVolume * 255 / 100);
+	_midiPlayer->syncVolume();
 }
 
 /**


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