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

[bluegr]

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:
eb97c05ccc LAB: Merge all the different scene restoring code after saving/loading
c5d78ecd63 LAB: Allow saving/loading in animated scenes - bug #7014


Commit: eb97c05cccc78f0dc314034ee813c06f5fa3ea74
    https://github.com/scummvm/scummvm/commit/eb97c05cccc78f0dc314034ee813c06f5fa3ea74
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2016-02-08T00:19:05+02:00

Commit Message:
LAB: Merge all the different scene restoring code after saving/loading

Changed paths:
    engines/lab/lab.cpp
    engines/lab/savegame.cpp



diff --git a/engines/lab/lab.cpp b/engines/lab/lab.cpp
index 0a4cf4e..45b895d 100644
--- a/engines/lab/lab.cpp
+++ b/engines/lab/lab.cpp
@@ -214,12 +214,6 @@ void LabEngine::updateEvents() {
 
 Common::Error LabEngine::loadGameState(int slot) {
 	bool result = loadGame(slot);
-	_curFileName = " ";
-	_closeDataPtr = nullptr;
-	_mainDisplay = true;
-	_followingCrumbs = false;
-	_event->simulateEvent();
-	_graphics->_longWinInFront = false;
 	return (result) ? Common::kNoError : Common::kUserCanceled;
 }
 
diff --git a/engines/lab/savegame.cpp b/engines/lab/savegame.cpp
index 16c4044..656595e 100644
--- a/engines/lab/savegame.cpp
+++ b/engines/lab/savegame.cpp
@@ -157,6 +157,11 @@ bool LabEngine::saveGame(int slot, const Common::String desc) {
 	file->finalize();
 	delete file;
 
+	_mainDisplay = true;
+	_alternate = false;
+	_event->simulateEvent();
+	_graphics->screenUpdate();
+
 	return true;
 }
 
@@ -202,6 +207,17 @@ bool LabEngine::loadGame(int slot) {
 
 	delete file;
 
+	_curFileName = " ";
+	_closeDataPtr = nullptr;
+	_followingCrumbs = false;
+	_graphics->_longWinInFront = false;
+	_event->initMouse();
+
+	_mainDisplay = true;
+	_alternate = false;
+	_event->simulateEvent();
+	_graphics->screenUpdate();
+
 	return true;
 }
 
@@ -238,11 +254,6 @@ bool LabEngine::saveRestoreGame() {
 		delete dialog;
 	}
 
-	_alternate = false;
-	_mainDisplay = true;
-	_event->initMouse();
-	_graphics->screenUpdate();
-
 	return isOK;
 }
 


Commit: c5d78ecd63f2c4c64ab72bb50aee5a7deed0abb2
    https://github.com/scummvm/scummvm/commit/c5d78ecd63f2c4c64ab72bb50aee5a7deed0abb2
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2016-02-08T00:19:06+02:00

Commit Message:
LAB: Allow saving/loading in animated scenes - bug #7014

Changed paths:
    engines/lab/lab.cpp



diff --git a/engines/lab/lab.cpp b/engines/lab/lab.cpp
index 45b895d..9b0ebfc 100644
--- a/engines/lab/lab.cpp
+++ b/engines/lab/lab.cpp
@@ -223,11 +223,11 @@ Common::Error LabEngine::saveGameState(int slot, const Common::String &desc) {
 }
 
 bool LabEngine::canLoadGameStateCurrently() {
-	return !_anim->isPlaying() && !_introPlaying;
+	return !_introPlaying;
 }
 
 bool LabEngine::canSaveGameStateCurrently() {
-	return !_anim->isPlaying() && !_introPlaying;
+	return !_introPlaying;
 }
 
 } // End of namespace Lab