[Scummvm-cvs-logs] SF.net SVN: scummvm:[44022] scummvm/trunk/engines/gob/hotspots.cpp

[drmccoy at users.sourceforge.net]

Revision: 44022
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44022&view=rev
Author:   drmccoy
Date:     2009-09-09 23:10:53 +0000 (Wed, 09 Sep 2009)

Log Message:
-----------
Really fixing searchHotspot, syntax-wise at least. (Note: Hotspots::Hotspot::left is unsigned, so a comparison with -1 will always yield false. And for left == 0xFFFF a method already exists, Hotspots::Hotspot::isEnd())

Modified Paths:
--------------
    scummvm/trunk/engines/gob/hotspots.cpp

Modified: scummvm/trunk/engines/gob/hotspots.cpp
===================================================================
--- scummvm/trunk/engines/gob/hotspots.cpp	2009-09-09 22:12:21 UTC (rev 44021)
+++ scummvm/trunk/engines/gob/hotspots.cpp	2009-09-09 23:10:53 UTC (rev 44022)
@@ -1567,7 +1567,7 @@
 
 bool Hotspots::searchHotspot(int16 shortId) const {
 	for (int i = 0; i < kHotspotCount; i++) {
-		if (_hotspots[i].left == -1)
+		if (_hotspots[i].isEnd())
 			return false;
 		if ((_hotspots[i].id == 0xD000 + shortId) || (_hotspots[i].id == 0xB000 + shortId) || (_hotspots[i].id == 0x4000 + shortId))
 			return true;


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