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

Kirben at users.sourceforge.net Kirben at users.sourceforge.net
Fri Apr 24 12:07:34 CEST 2009


Revision: 40098
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40098&view=rev
Author:   Kirben
Date:     2009-04-24 10:07:34 +0000 (Fri, 24 Apr 2009)

Log Message:
-----------
Fix pausing during video play back.

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

Modified: scummvm/trunk/engines/agos/agos.cpp
===================================================================
--- scummvm/trunk/engines/agos/agos.cpp	2009-04-23 22:22:46 UTC (rev 40097)
+++ scummvm/trunk/engines/agos/agos.cpp	2009-04-24 10:07:34 UTC (rev 40098)
@@ -983,13 +983,11 @@
 
 		_midi.pause(true);
 		_mixer->pauseAll(true);
-		_sound->ambientPause(true);
 	} else {
 		_pause = false;
 
 		_midi.pause(_musicPaused);
 		_mixer->pauseAll(false);
-		_sound->ambientPause(_ambientPaused);
 	}
 }
 
@@ -998,8 +996,10 @@
 
 	while (_pause && !shouldQuit()) {
 		delay(1);
-		if (_keyPressed.keycode == Common::KEYCODE_PAUSE)
+		if (_keyPressed.keycode == Common::KEYCODE_PAUSE) {
 			pauseEngine(false);
+			_keyPressed.reset();
+		}
 	}
 }
 

Modified: scummvm/trunk/engines/agos/animation.cpp
===================================================================
--- scummvm/trunk/engines/agos/animation.cpp	2009-04-23 22:22:46 UTC (rev 40097)
+++ scummvm/trunk/engines/agos/animation.cpp	2009-04-24 10:07:34 UTC (rev 40098)
@@ -100,6 +100,8 @@
 	while (eventMan->pollEvent(event)) {
 		switch (event.type) {
 		case Common::EVENT_KEYDOWN:
+			if (event.kbd.keycode == Common::KEYCODE_PAUSE)
+				_vm->pause();
 			if (event.kbd.ascii == 27) {
 				_leftButtonDown = true;
 				_rightButtonDown = true;


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