Ensure zone and animation flags are restored when a location is reloaded. This should definitely fix bug #2718462.

svn-id: r39739

1 files changed, 16 insertions, 4 deletions

diff --git a/engines/parallaction/parallaction_br.cpp b/engines/parallaction/parallaction_br.cpp
index 0cd89bf647..73ab2c0bb6 100644
--- a/engines/parallaction/parallaction_br.cpp
+++ b/engines/parallaction/parallaction_br.cpp
@@ -344,14 +344,26 @@ void Parallaction_br::parseLocation(const char *filename) {
 	_locationParser->parse(script);
 	delete script;
 
+	bool visited = getLocationFlags() & kFlagsVisited;
+
 	// this loads animation scripts
-	AnimationList::iterator it = _location._animations.begin();
-	for ( ; it != _location._animations.end(); ++it) {
-		if ((*it)->_scriptName) {
-			loadProgram(*it, (*it)->_scriptName);
+	AnimationList::iterator ait = _location._animations.begin();
+	for ( ; ait != _location._animations.end(); ++ait) {
+		// restore the flags if the location has already been visited
+		restoreOrSaveZoneFlags(*ait, visited);
+
+		// load the script
+		if ((*ait)->_scriptName) {
+			loadProgram(*ait, (*ait)->_scriptName);
 		}
 	}
 
+	ZoneList::iterator zit = _vm->_location._zones.begin();
+	for ( ; zit != _vm->_location._zones.end(); ++zit) {
+		// restore the flags if the location has already been visited
+		restoreOrSaveZoneFlags(*zit, visited);
+	}
+
 	debugC(1, kDebugParser, "parseLocation('%s') done", filename);
 	return;
 }