[Scummvm-cvs-logs] SF.net SVN: scummvm: [26895] scummvm/trunk/engines/parallaction/location. cpp

[peres001 at users.sourceforge.net]

Revision: 26895
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26895&view=rev
Author:   peres001
Date:     2007-05-20 13:35:08 -0700 (Sun, 20 May 2007)

Log Message:
-----------
Fixed regression: location comment wasn't shown on every location except the first visited.

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/location.cpp

Modified: scummvm/trunk/engines/parallaction/location.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/location.cpp	2007-05-20 19:59:15 UTC (rev 26894)
+++ scummvm/trunk/engines/parallaction/location.cpp	2007-05-20 20:35:08 UTC (rev 26895)
@@ -122,6 +122,7 @@
 		}
 		if (!scumm_stricmp(_tokens[0], "COMMENT")) {
 			_location._comment = parseComment(*_locationScript);
+			debugC(3, kDebugLocation, "Location comment: '%s'", _location._comment);
 		}
 		if (!scumm_stricmp(_tokens[0], "ENDCOMMENT")) {
 			_location._endComment = parseComment(*_locationScript);
@@ -370,7 +371,11 @@
 		runJobs();
 		_gfx->swapBuffers();
 	}
-
+	
+	if (_location._comment) {
+		doLocationEnterTransition();
+	}
+	
 	runJobs();
 	_gfx->swapBuffers();
 
@@ -399,9 +404,11 @@
 void Parallaction::doLocationEnterTransition() {
 	debugC(1, kDebugLocation, "doLocationEnterTransition");
 
-	if (_localFlags[_currentLocationIndex] & kFlagsVisited)
-		return; // visited
-
+    if (_localFlags[_currentLocationIndex] & kFlagsVisited) {
+        debugC(3, kDebugLocation, "skipping location transition");
+        return; // visited
+    }
+ 
 	byte pal[PALETTE_SIZE];
 	_gfx->buildBWPalette(pal);
 	_gfx->setPalette(pal);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.