[Scummvm-cvs-logs] scummvm master -> 6a3d0e712940bf4560e5302c40f07f5f6eb8e0aa

lordhoto lordhoto at gmail.com
Sat Jan 14 17:07:08 CET 2012


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

Summary:
c805e5f5dc KYRA: Fix missing debug commands.
6a3d0e7129 KYRA: Make workaround for bug #1498221 work again.


Commit: c805e5f5dc71fda908218e049b81b4080919f93e
    https://github.com/scummvm/scummvm/commit/c805e5f5dc71fda908218e049b81b4080919f93e
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-01-14T08:04:35-08:00

Commit Message:
KYRA: Fix missing debug commands.

This is a regression from cfac223cee7cc8136fdf43dea1465a1b060a803b.

Changed paths:
    engines/kyra/debugger.cpp



diff --git a/engines/kyra/debugger.cpp b/engines/kyra/debugger.cpp
index 95c6162..6514984 100644
--- a/engines/kyra/debugger.cpp
+++ b/engines/kyra/debugger.cpp
@@ -205,6 +205,7 @@ void Debugger_LoK::initialize() {
 	DCmd_Register("scenes",             WRAP_METHOD(Debugger_LoK, cmd_listScenes));
 	DCmd_Register("give",               WRAP_METHOD(Debugger_LoK, cmd_giveItem));
 	DCmd_Register("birthstones",        WRAP_METHOD(Debugger_LoK, cmd_listBirthstones));
+	Debugger::initialize();
 }
 
 bool Debugger_LoK::cmd_enterRoom(int argc, const char **argv) {
@@ -295,6 +296,7 @@ void Debugger_v2::initialize() {
 	DCmd_Register("scene_info",         WRAP_METHOD(Debugger_v2, cmd_sceneInfo));
 	DCmd_Register("scene_to_facing",    WRAP_METHOD(Debugger_v2, cmd_sceneToFacing));
 	DCmd_Register("give",               WRAP_METHOD(Debugger_v2, cmd_giveItem));
+	Debugger::initialize();
 }
 
 bool Debugger_v2::cmd_enterScene(int argc, const char **argv) {
@@ -445,6 +447,7 @@ Debugger_HoF::Debugger_HoF(KyraEngine_HoF *vm) : Debugger_v2(vm), _vm(vm) {
 
 void Debugger_HoF::initialize() {
 	DCmd_Register("pass_codes",         WRAP_METHOD(Debugger_HoF, cmd_passcodes));
+	Debugger_v2::initialize();
 }
 
 bool Debugger_HoF::cmd_passcodes(int argc, const char **argv) {


Commit: 6a3d0e712940bf4560e5302c40f07f5f6eb8e0aa
    https://github.com/scummvm/scummvm/commit/6a3d0e712940bf4560e5302c40f07f5f6eb8e0aa
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-01-14T08:04:35-08:00

Commit Message:
KYRA: Make workaround for bug #1498221 work again.

The bug in question is "KYRA1: Glitches when meeting Zanthia".

This is a regression from 0af418e7ea3a41f93fcc551a45ee5bae822d812a as far as
I can tell.

Changed paths:
    engines/kyra/kyra_lok.cpp



diff --git a/engines/kyra/kyra_lok.cpp b/engines/kyra/kyra_lok.cpp
index c195f02..74db67d 100644
--- a/engines/kyra/kyra_lok.cpp
+++ b/engines/kyra/kyra_lok.cpp
@@ -510,7 +510,14 @@ void KyraEngine_LoK::delay(uint32 amount, bool update, bool isMainLoop) {
 			updateTextFade();
 			updateMousePointer();
 		} else {
-			_screen->updateScreen();
+			// We call OSystem::updateScreen here and not Screen::updateScreen
+			// to avoid new graphics changes to be copied to the screen.
+			// This assures the workaround of bug #1498221
+			// "KYRA1: Glitches when meeting Zanthia" is working correctly.
+			// Since we only call updateScreen here to let systems with frame
+			// update count limitations not miss any graphics updates it
+			// should not cause any problems.
+			_system->updateScreen();
 		}
 
 		_isSaveAllowed = isMainLoop;






More information about the Scummvm-git-logs mailing list