[Scummvm-cvs-logs] SF.net SVN: scummvm:[44509] scummvm/branches/branch-1-0-0/engines/gob/ hotspots.cpp

[strangerke at users.sourceforge.net]

Revision: 44509
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44509&view=rev
Author:   strangerke
Date:     2009-10-01 08:38:16 +0000 (Thu, 01 Oct 2009)

Log Message:
-----------
Backport of R44496 : Fix a regression in Hotspots

Modified Paths:
--------------
    scummvm/branches/branch-1-0-0/engines/gob/hotspots.cpp

Modified: scummvm/branches/branch-1-0-0/engines/gob/hotspots.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/gob/hotspots.cpp	2009-10-01 08:32:35 UTC (rev 44508)
+++ scummvm/branches/branch-1-0-0/engines/gob/hotspots.cpp	2009-10-01 08:38:16 UTC (rev 44509)
@@ -1376,7 +1376,15 @@
 		} else if (hotspotIndex2 != 0) {
 			findNthPlain(hotspotIndex2, endIndex, id, index);
 		} else {
-			findNthPlain(0, 0, id, index);
+			// Enter the first hotspot
+			for (int i = 0; (i < kHotspotCount) && !_hotspots[i].isEnd(); i++) {
+				Hotspot &spot = _hotspots[i];
+				if (spot.isFilledNew()) {
+					id    = spot.id;
+					index = i;
+					break;
+				}
+			}
 
 			// Leave the current hotspot
 			if ((_currentKey != 0) && (_hotspots[_currentIndex].funcLeave != 0))


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