[Scummvm-cvs-logs] SF.net SVN: scummvm: [29525] scummvm/trunk/engines/lure/res.cpp
dreammaster at users.sourceforge.net
dreammaster at users.sourceforge.net
Sat Nov 17 07:52:35 CET 2007
Revision: 29525
http://scummvm.svn.sourceforge.net/scummvm/?rev=29525&view=rev
Author: dreammaster
Date: 2007-11-16 22:52:35 -0800 (Fri, 16 Nov 2007)
Log Message:
-----------
Cleaned up the logic of the activateHotspot method
Modified Paths:
--------------
scummvm/trunk/engines/lure/res.cpp
Modified: scummvm/trunk/engines/lure/res.cpp
===================================================================
--- scummvm/trunk/engines/lure/res.cpp 2007-11-17 00:19:45 UTC (rev 29524)
+++ scummvm/trunk/engines/lure/res.cpp 2007-11-17 06:52:35 UTC (rev 29525)
@@ -511,12 +511,9 @@
res->roomNumber &= 0x7fff; // clear any suppression bit in room #
// Make sure that the hotspot isn't already active
- HotspotList::iterator i = _activeHotspots.begin();
- for (; i != _activeHotspots.end(); ++i) {
- Hotspot *h = *i;
- if (h->hotspotId() == res->hotspotId)
- return h;
- }
+ Hotspot *h = getActiveHotspot(hotspotId);
+ if (h != NULL)
+ return h;
// Check the script load flag
if (res->scriptLoadFlag) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list