[Scummvm-cvs-logs] SF.net SVN: scummvm:[53891] scummvm/branches/branch-1-2-0/engines/sci/ console.cpp

[thebluegr at users.sourceforge.net]

Revision: 53891
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53891&view=rev
Author:   thebluegr
Date:     2010-10-27 21:46:21 +0000 (Wed, 27 Oct 2010)

Log Message:
-----------
(backport) SCI: Cleanup, invoking pauseEngine() on Console::preEnter() and Console::postEnter()

Modified Paths:
--------------
    scummvm/branches/branch-1-2-0/engines/sci/console.cpp

Modified: scummvm/branches/branch-1-2-0/engines/sci/console.cpp
===================================================================
--- scummvm/branches/branch-1-2-0/engines/sci/console.cpp	2010-10-27 21:43:08 UTC (rev 53890)
+++ scummvm/branches/branch-1-2-0/engines/sci/console.cpp	2010-10-27 21:46:21 UTC (rev 53891)
@@ -219,17 +219,11 @@
 }
 
 void Console::preEnter() {
-	if (_engine && _engine->_soundCmd)
-		_engine->_soundCmd->pauseAll(true);
-	g_system->getMixer()->pauseAll(true);
+	_engine->pauseEngine(true);
 	_enterTime = g_system->getMillis();
 }
 
 void Console::postEnter() {
-	if (_engine && _engine->_soundCmd)
-		g_sci->_soundCmd->pauseAll(false);
-	g_system->getMixer()->pauseAll(false);
-
 	if (!_videoFile.empty()) {
 		_engine->_gfxCursor->kernelHide();
 
@@ -286,6 +280,7 @@
 		_videoFrameDelay = 0;
 	}
 
+	_engine->pauseEngine(false);
 	// Subtract the time we were running the debugger from the game running time
 	_engine->_gamestate->gameStartTime += g_system->getMillis() - _enterTime;
 }


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