[Scummvm-cvs-logs] scummvm master -> 17027a7afc8db73ee136d481781fe4cdfd7ea7ef

dreammaster dreammaster at scummvm.org
Wed Nov 9 09:35:22 CET 2011


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:
17027a7afc CGE: Properly stop player moving when saving or restoring


Commit: 17027a7afc8db73ee136d481781fe4cdfd7ea7ef
    https://github.com/scummvm/scummvm/commit/17027a7afc8db73ee136d481781fe4cdfd7ea7ef
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-11-09T00:34:43-08:00

Commit Message:
CGE: Properly stop player moving when saving or restoring

Changed paths:
    engines/cge/cge_main.cpp



diff --git a/engines/cge/cge_main.cpp b/engines/cge/cge_main.cpp
index 8798a7f..cb03517 100644
--- a/engines/cge/cge_main.cpp
+++ b/engines/cge/cge_main.cpp
@@ -277,6 +277,7 @@ Common::String CGEEngine::generateSaveName(int slot) {
 Common::Error CGEEngine::loadGameState(int slot) {
 	// Clear current game activity
 	sceneDown();
+	_hero->park();
 	resetGame();
 
 	// Load the game
@@ -295,6 +296,7 @@ void CGEEngine::resetGame() {
 
 Common::Error CGEEngine::saveGameState(int slot, const Common::String &desc) {
 	sceneDown();
+	_hero->park();
 	_oldLev = _lev;
 
 	// Write out the user's progress
@@ -692,6 +694,7 @@ void CGEEngine::qGame() {
 	debugC(1, kCGEDebugEngine, "CGEEngine::qGame()");
 
 	sceneDown();
+	_hero->park();
 	_oldLev = _lev;
 
 	// Write out the user's progress






More information about the Scummvm-git-logs mailing list