[Scummvm-cvs-logs] scummvm master -> 8a29f98c9c2139da6c1f6bb2237765cad2534b34

[m-kiewitz]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
8a29f98c9c AGI: Don't pause in game timer while in menus


Commit: 8a29f98c9c2139da6c1f6bb2237765cad2534b34
    https://github.com/scummvm/scummvm/commit/8a29f98c9c2139da6c1f6bb2237765cad2534b34
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2016-02-02T21:28:47+01:00

Commit Message:
AGI: Don't pause in game timer while in menus

Original interpreter did not do it and we paused music/sfx,
which the original interpreter also didn't do.
Shouldn't cause issues.

Changed paths:
    engines/agi/menu.cpp



diff --git a/engines/agi/menu.cpp b/engines/agi/menu.cpp
index 3e00c9a..9ecf9c5 100644
--- a/engines/agi/menu.cpp
+++ b/engines/agi/menu.cpp
@@ -324,9 +324,6 @@ void GfxMenu::execute() {
 		}
 	}
 
-	// original AGI did not do this, at least when the menu was called by scripts
-	_vm->inGameTimerPause();
-
 	if (viaKeyboard) {
 		_vm->cycleInnerLoopActive(CYCLE_INNERLOOP_MENU_VIA_KEYBOARD);
 	} else if (viaMouse) {
@@ -337,9 +334,6 @@ void GfxMenu::execute() {
 		_vm->mainCycle();
 	} while (_vm->cycleInnerLoopIsActive() && !(_vm->shouldQuit() || _vm->_restartGame));
 
-	// original AGI did not do this, at least when the menu was called by scripts
-	_vm->inGameTimerResume();
-
 	if (_drawnMenuNr >= 0) {
 		removeActiveMenu(_drawnMenuNr);
 	}