[Scummvm-cvs-logs] scummvm master -> 5f9858844a24b00e75ef2c504b2d68c189261dd2

[bluegr]

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:
5f9858844a ZVISION: Fix saving when using the original save dialog


Commit: 5f9858844a24b00e75ef2c504b2d68c189261dd2
    https://github.com/scummvm/scummvm/commit/5f9858844a24b00e75ef2c504b2d68c189261dd2
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2015-01-20T01:21:16+02:00

Commit Message:
ZVISION: Fix saving when using the original save dialog

A regression from commit dcac5be493

Changed paths:
    engines/zvision/scripting/script_manager.cpp



diff --git a/engines/zvision/scripting/script_manager.cpp b/engines/zvision/scripting/script_manager.cpp
index 34376ce..a449110 100644
--- a/engines/zvision/scripting/script_manager.cpp
+++ b/engines/zvision/scripting/script_manager.cpp
@@ -594,26 +594,30 @@ void ScriptManager::ChangeLocationReal(bool isLoading) {
 
 	_engine->setRenderDelay(2);
 
-	if (!enteringMenu) {
-		if (!isLoading && !leavingMenu) {
+	if (!leavingMenu) {
+		if (!isLoading && !enteringMenu) {
 			setStateValue(StateKey_LastWorld, getStateValue(StateKey_World));
 			setStateValue(StateKey_LastRoom, getStateValue(StateKey_Room));
 			setStateValue(StateKey_LastNode, getStateValue(StateKey_Node));
 			setStateValue(StateKey_LastView, getStateValue(StateKey_View));
 			setStateValue(StateKey_LastViewPos, getStateValue(StateKey_ViewPos));
+		} else {
+			setStateValue(StateKey_Menu_LastWorld, getStateValue(StateKey_World));
+			setStateValue(StateKey_Menu_LastRoom, getStateValue(StateKey_Room));
+			setStateValue(StateKey_Menu_LastNode, getStateValue(StateKey_Node));
+			setStateValue(StateKey_Menu_LastView, getStateValue(StateKey_View));
+			setStateValue(StateKey_Menu_LastViewPos, getStateValue(StateKey_ViewPos));
 		}
-	} else {
-		setStateValue(StateKey_Menu_LastWorld, getStateValue(StateKey_World));
-		setStateValue(StateKey_Menu_LastRoom, getStateValue(StateKey_Room));
-		setStateValue(StateKey_Menu_LastNode, getStateValue(StateKey_Node));
-		setStateValue(StateKey_Menu_LastView, getStateValue(StateKey_View));
-		setStateValue(StateKey_Menu_LastViewPos, getStateValue(StateKey_ViewPos));
 	}
 
-	if (isSaveScreen && !leavingMenu) {
-		_engine->getSaveManager()->prepareSaveBuffer();
-	} else if (leavingMenu) {
-		_engine->getSaveManager()->flushSaveBuffer();
+	if (enteringMenu) {
+		if (isSaveScreen && !leavingMenu) {
+			_engine->getSaveManager()->prepareSaveBuffer();
+		}
+	} else {
+		if (leavingMenu) {
+			_engine->getSaveManager()->flushSaveBuffer();
+		}
 	}
 
 	setStateValue(StateKey_World, _nextLocation.world);