[Scummvm-cvs-logs] SF.net SVN: scummvm: [32241] scummvm/trunk/engines/agos

[Kirben at users.sourceforge.net]

Revision: 32241
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32241&view=rev
Author:   Kirben
Date:     2008-05-23 18:17:04 -0700 (Fri, 23 May 2008)

Log Message:
-----------
Add Max's patch for AGOSEngine::pauseEngineIntern().

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

Modified: scummvm/trunk/engines/agos/agos.cpp
===================================================================
--- scummvm/trunk/engines/agos/agos.cpp	2008-05-24 01:06:19 UTC (rev 32240)
+++ scummvm/trunk/engines/agos/agos.cpp	2008-05-24 01:17:04 UTC (rev 32241)
@@ -917,25 +917,31 @@
 	return _debugger;
 }
 
+void AGOSEngine::pauseEngineIntern(bool pauseIt) {
+	if (pauseIt) {
+		_keyPressed.reset();
+		_pause = true;
+
+		_midi.pause(true);
+		_mixer->pauseAll(true);
+		_sound->ambientPause(true);
+	} else {
+		_pause = false;
+
+		_midi.pause(_musicPaused);
+		_mixer->pauseAll(false);
+		_sound->ambientPause(_ambientPaused);
+	}
+}
+
 void AGOSEngine::pause() {
-	_keyPressed.reset();
-	_pause = true;
-	bool ambient_status = _ambientPaused;
-	bool music_status = _musicPaused;
+	pauseEngine(true);
 
-	_midi.pause(true);
-	_mixer->pauseAll(true);
-	_sound->ambientPause(true);
-
 	while (_pause) {
 		delay(1);
 		if (_keyPressed.keycode == Common::KEYCODE_p)
-			_pause = false;
+			pauseEngine(false);
 	}
-
-	_midi.pause(music_status);
-	_mixer->pauseAll(false);
-	_sound->ambientPause(ambient_status);
 }
 
 int AGOSEngine::go() {

Modified: scummvm/trunk/engines/agos/agos.h
===================================================================
--- scummvm/trunk/engines/agos/agos.h	2008-05-24 01:06:19 UTC (rev 32240)
+++ scummvm/trunk/engines/agos/agos.h	2008-05-24 01:17:04 UTC (rev 32241)
@@ -1205,6 +1205,7 @@
 	void checkTimerCallback();
 	void delay(uint delay);
 	void pause();
+	virtual void pauseEngineIntern(bool pause);
 
 	void waitForMark(uint i);
 	void scrollScreen();


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