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

criezy criezy at scummvm.org
Sat Sep 13 19:42:02 CEST 2014


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:
b783d75f83 SWORD1: Add missing update of screen parameters when loading game from GMM


Commit: b783d75f83d9f466d84ed3c9db91515f8a976c72
    https://github.com/scummvm/scummvm/commit/b783d75f83d9f466d84ed3c9db91515f8a976c72
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2014-09-13T18:40:46+01:00

Commit Message:
SWORD1: Add missing update of screen parameters when loading game from GMM

This fixes bug #6728 (crash when loading game from GMM in bull's
head scene). I am not sure the call to Logic::Engine is necessary, but
that way the same sequence of calls is done when restoring a game
from the original GUI and when restoring from GMM.

Changed paths:
    engines/sword1/sword1.cpp



diff --git a/engines/sword1/sword1.cpp b/engines/sword1/sword1.cpp
index 08ea02f..1e9b7f7 100644
--- a/engines/sword1/sword1.cpp
+++ b/engines/sword1/sword1.cpp
@@ -774,6 +774,8 @@ void SwordEngine::reinitRes() {
 	_logic->newScreen(Logic::_scriptVars[NEW_SCREEN]);
 	_sound->newScreen(Logic::_scriptVars[NEW_SCREEN]);
 	Logic::_scriptVars[SCREEN] = Logic::_scriptVars[NEW_SCREEN];
+	_logic->engine();
+	_logic->updateScreenParams();
 	_screen->fullRefresh();
 	_screen->draw();
 }






More information about the Scummvm-git-logs mailing list