[Scummvm-cvs-logs] SF.net SVN: scummvm: [29272] scummvm/trunk/engines/lure

dreammaster at users.sourceforge.net dreammaster at users.sourceforge.net
Sun Oct 28 04:34:10 CET 2007


Revision: 29272
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29272&view=rev
Author:   dreammaster
Date:     2007-10-27 20:34:10 -0700 (Sat, 27 Oct 2007)

Log Message:
-----------
Sound is now paused when displaying menu dialogs

Modified Paths:
--------------
    scummvm/trunk/engines/lure/game.cpp
    scummvm/trunk/engines/lure/surface.cpp

Modified: scummvm/trunk/engines/lure/game.cpp
===================================================================
--- scummvm/trunk/engines/lure/game.cpp	2007-10-28 03:32:13 UTC (rev 29271)
+++ scummvm/trunk/engines/lure/game.cpp	2007-10-28 03:34:10 UTC (rev 29272)
@@ -839,6 +839,7 @@
 	Mouse &mouse = Mouse::getReference();
 	Screen &screen = Screen::getReference();
 
+	Sound.pause();
 	mouse.cursorOff();
 	Palette p(CREDITS_RESOURCE_ID - 1);
 	Surface *s = Surface::getScreen(CREDITS_RESOURCE_ID);
@@ -851,16 +852,21 @@
 	screen.resetPalette();
 	screen.update();
 	mouse.cursorOn();
+	Sound.resume();
 }
 
 void Game::doQuit() {
+	Sound.pause();
 	if (getYN()) 
 		Events::getReference().quitFlag = true;
+	Sound.resume();
 }
 
 void Game::doRestart() {
+	Sound.pause();
 	if (getYN())
 		setState(GS_RESTART);
+	Sound.resume();
 }
 
 void Game::doTextSpeed() {
@@ -878,8 +884,9 @@
 	_soundFlag = !_soundFlag;
 	menu.getMenu(2).entries()[2] = sl.getString(_soundFlag ? S_SOUND_ON : S_SOUND_OFF);
 
-	// Stop all currently playing sounds
-	Sound.killSounds();
+	if (!_soundFlag)
+		// Stop all currently playing sounds
+		Sound.killSounds();
 }
 
 void Game::handleBootParam(int value) {

Modified: scummvm/trunk/engines/lure/surface.cpp
===================================================================
--- scummvm/trunk/engines/lure/surface.cpp	2007-10-28 03:32:13 UTC (rev 29271)
+++ scummvm/trunk/engines/lure/surface.cpp	2007-10-28 03:34:10 UTC (rev 29272)
@@ -719,6 +719,7 @@
 	s->copyTo(&screen.screen(), SAVE_DIALOG_X, SAVE_DIALOG_Y);
 	screen.update();
 	mouse.pushCursorNum(CURSOR_ARROW);
+	Sound.pause();
 
 	bool abortFlag = false;
 	bool doneFlag = false;
@@ -801,6 +802,8 @@
 		doneFlag = true;
 	}
 
+	Sound.resume();
+
 	if (doneFlag) {
 		// Handle save or restore
 		if (saveDialog)


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




More information about the Scummvm-git-logs mailing list