[Scummvm-cvs-logs] scummvm master -> 6229bcb9f291e5e8d82688f7809575c1bf3f4c99

[dreammaster]

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:
a96f260653 MADS: Change order of savegame loading to fix scene 318
6229bcb9f2 MADS: Fix loading fonts used by animations


Commit: a96f2606539a532848907df1e0d3604ca18573d2
    https://github.com/scummvm/scummvm/commit/a96f2606539a532848907df1e0d3604ca18573d2
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2014-05-30T20:41:55-04:00

Commit Message:
MADS: Change order of savegame loading to fix scene 318

Changed paths:
    engines/mads/game.cpp



diff --git a/engines/mads/game.cpp b/engines/mads/game.cpp
index 05dd932..ed97dca 100644
--- a/engines/mads/game.cpp
+++ b/engines/mads/game.cpp
@@ -279,10 +279,6 @@ void Game::sectionLoop() {
 		_trigger = 0;
 		_priorFrameTimer = _scene._frameStartTime;
 
-		// Call the scene logic for entering the given scene
-		_triggerSetupMode = SEQUENCE_TRIGGER_DAEMON;
-		_scene._sceneLogic->enter();
-
 		// If in the middle of restoring a game, handle the rest of the loading
 		if (_saveFile != nullptr) {
 			Common::Serializer s(_saveFile, nullptr);
@@ -291,6 +287,10 @@ void Game::sectionLoop() {
 			_saveFile = nullptr;
 		}
 
+		// Call the scene logic for entering the given scene
+		_triggerSetupMode = SEQUENCE_TRIGGER_DAEMON;
+		_scene._sceneLogic->enter();
+
 		// Set player data
 		_player._targetPos = _player._playerPos;
 		_player._turnToFacing = _player._facing;


Commit: 6229bcb9f291e5e8d82688f7809575c1bf3f4c99
    https://github.com/scummvm/scummvm/commit/6229bcb9f291e5e8d82688f7809575c1bf3f4c99
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2014-05-30T20:42:17-04:00

Commit Message:
MADS: Fix loading fonts used by animations

Changed paths:
    engines/mads/font.cpp



diff --git a/engines/mads/font.cpp b/engines/mads/font.cpp
index 6af1346..f7c1c52 100644
--- a/engines/mads/font.cpp
+++ b/engines/mads/font.cpp
@@ -89,7 +89,11 @@ void Font::setFont(const Common::String &filename) {
 
 	_filename = filename;
 
-	MadsPack fontData(filename, _vm);
+	Common::String resName = filename;
+	if (!resName.hasSuffix(".FF"))
+		resName += ".FF";
+
+	MadsPack fontData(resName, _vm);
 	Common::SeekableReadStream *fontFile = fontData.getItemStream(0);
 
 	_maxHeight = fontFile->readByte();