[Scummvm-cvs-logs] scummvm master -> 0fafb6a62c13f6f5a4ef6215a4be592ed84f248c

[RichieSams]

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:
0fafb6a62c Revert "ZVISION: Don't change location when coming back from ScummVM save dialog"


Commit: 0fafb6a62c13f6f5a4ef6215a4be592ed84f248c
    https://github.com/scummvm/scummvm/commit/0fafb6a62c13f6f5a4ef6215a4be592ed84f248c
Author: RichieSams (adastley at gmail.com)
Date: 2015-01-18T20:11:10-06:00

Commit Message:
Revert "ZVISION: Don't change location when coming back from ScummVM save dialog"

This reverts commit b835eacc0cd401bb0d15a33e60d2ac47ebb4d718.

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 a4ab457..4792a02 100644
--- a/engines/zvision/scripting/script_manager.cpp
+++ b/engines/zvision/scripting/script_manager.cpp
@@ -576,8 +576,11 @@ void ScriptManager::ChangeLocationReal() {
 				_nextLocation.node = _currentLocation.node;
 				_nextLocation.view = _currentLocation.view;
 				_nextLocation.offset = _currentLocation.offset;
-				
-				return;
+				_currentLocation.world = '0';
+				_currentLocation.room = '0';
+				_currentLocation.node = '0';
+				_currentLocation.view = '0';
+				_currentLocation.offset = 0;
 			} else {
 				return;
 			}
@@ -740,6 +743,11 @@ void ScriptManager::deserialize(Common::SeekableReadStream *stream) {
 	cleanScriptScope(room);
 	cleanScriptScope(world);
 
+	_currentLocation.node = 0;
+	_currentLocation.world = 0;
+	_currentLocation.room = 0;
+	_currentLocation.view = 0;
+
 	for (SideFXList::iterator iter = _activeSideFx.begin(); iter != _activeSideFx.end(); iter++) {
 		delete(*iter);
 	}