[Scummvm-cvs-logs] scummvm master -> ab2e5015afe136ce4ef37edbba0faa58c8a9cc61

[Strangerke]

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:
ab2e5015af CGE: Soltys - Fix for bug #3448836 (losing scene number display after loading and changing scene)


Commit: ab2e5015afe136ce4ef37edbba0faa58c8a9cc61
    https://github.com/scummvm/scummvm/commit/ab2e5015afe136ce4ef37edbba0faa58c8a9cc61
Author: Strangerke (strangerke at scummvm.org)
Date: 2011-12-03T05:55:04-08:00

Commit Message:
CGE: Soltys - Fix for bug #3448836 (losing scene number display after loading and changing scene)

Changed paths:
    engines/cge/cge_main.cpp



diff --git a/engines/cge/cge_main.cpp b/engines/cge/cge_main.cpp
index c67356e..6bcdb0f 100644
--- a/engines/cge/cge_main.cpp
+++ b/engines/cge/cge_main.cpp
@@ -688,6 +688,7 @@ void CGEEngine::xScene() {
 	debugC(6, kCGEDebugEngine, "CGEEngine::xScene()");
 
 	sceneDown();
+	_commandHandler->addCommand(kCmdLevel, -1, _lev, &_sceneLight);
 	sceneUp();
 }
 
@@ -729,6 +730,7 @@ void CGEEngine::switchScene(int newScene) {
 			keyClick();
 		_commandHandler->addCommand(kCmdLabel, -1, 0, NULL);  // wait for repaint
 		_commandHandler->addCallback(kCmdExec,  0, 0, kXScene); // switch scene
+
 	}
 }
 
@@ -821,7 +823,7 @@ void System::tick() {
 			if (_vm->_commandHandler->idle()) {
 				if (_vm->_flag[0]) // Pain flag
 					_vm->heroCover(9);
-				else { // CHECKME: Before, was: if (Startup::_core >= CORE_MID) {
+				else {
 					int n = _vm->newRandom(100);
 					if (n > 96)
 						_vm->heroCover(6 + (_vm->_hero->_x + _vm->_hero->_w / 2 < kScrWidth / 2));