[Scummvm-cvs-logs] SF.net SVN: scummvm:[35035] scummvm/trunk/engines/saga

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Thu Nov 13 10:19:43 CET 2008


Revision: 35035
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35035&view=rev
Author:   thebluegr
Date:     2008-11-13 09:19:42 +0000 (Thu, 13 Nov 2008)

Log Message:
-----------
Added better checks for the current music status in pauseEngineIntern()

Modified Paths:
--------------
    scummvm/trunk/engines/saga/saga.cpp
    scummvm/trunk/engines/saga/saga.h

Modified: scummvm/trunk/engines/saga/saga.cpp
===================================================================
--- scummvm/trunk/engines/saga/saga.cpp	2008-11-13 09:00:51 UTC (rev 35034)
+++ scummvm/trunk/engines/saga/saga.cpp	2008-11-13 09:19:42 UTC (rev 35035)
@@ -147,6 +147,7 @@
 	_copyProtection = ConfMan.getBool("copy_protection");
 	_gf_wyrmkeep = false;
 	_gf_compressed_sounds = false;
+	_musicWasPlaying = false;
 
 	if (_readingSpeed > 3)
 		_readingSpeed = 0;
@@ -539,12 +540,17 @@
 
 	if (pause) {
 		_render->setFlag(RF_RENDERPAUSE);
-		if (!_music->hasDigitalMusic())
+		if (_music->isPlaying()) {
 			_music->pause();
+			_musicWasPlaying = true;
+		} else {
+			_musicWasPlaying = false;
+		}
 	} else {
 		_render->clearFlag(RF_RENDERPAUSE);
-		if (!_music->hasDigitalMusic())
+		if (_musicWasPlaying) {
 			_music->resume();
+		}
 	}
 
 	_mixer->pauseAll(pause);

Modified: scummvm/trunk/engines/saga/saga.h
===================================================================
--- scummvm/trunk/engines/saga/saga.h	2008-11-13 09:00:51 UTC (rev 35034)
+++ scummvm/trunk/engines/saga/saga.h	2008-11-13 09:19:42 UTC (rev 35035)
@@ -535,6 +535,7 @@
 	bool _copyProtection;
 	bool _gf_wyrmkeep;
 	bool _gf_compressed_sounds;
+	bool _musicWasPlaying;
 
 	SndRes *_sndRes;
 	Sound *_sound;


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