[Scummvm-cvs-logs] SF.net SVN: scummvm: [31622] scummvm/trunk/engines/m4

anotherguest at users.sourceforge.net anotherguest at users.sourceforge.net
Sun Apr 20 19:29:37 CEST 2008


Revision: 31622
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31622&view=rev
Author:   anotherguest
Date:     2008-04-20 10:29:37 -0700 (Sun, 20 Apr 2008)

Log Message:
-----------
unlink function name causing conflicts. Renaming to unlinkItem.

Modified Paths:
--------------
    scummvm/trunk/engines/m4/hotspot.cpp
    scummvm/trunk/engines/m4/hotspot.h

Modified: scummvm/trunk/engines/m4/hotspot.cpp
===================================================================
--- scummvm/trunk/engines/m4/hotspot.cpp	2008-04-20 17:26:48 UTC (rev 31621)
+++ scummvm/trunk/engines/m4/hotspot.cpp	2008-04-20 17:29:37 UTC (rev 31622)
@@ -125,11 +125,11 @@
 }
 
 void HotSpotList::remove(HotSpot *hotspot) {
-	unlink(hotspot);
+	unlinkItem(hotspot);
 	delete hotspot; //TODO: check this?
 }
 
-void HotSpotList::unlink(HotSpot *hotspot) {
+void HotSpotList::unlinkItem(HotSpot *hotspot) {
 	uint index = 0;
 	while (index < _hotspots.size()) {
 		if (_hotspots[index] == hotspot) {

Modified: scummvm/trunk/engines/m4/hotspot.h
===================================================================
--- scummvm/trunk/engines/m4/hotspot.h	2008-04-20 17:26:48 UTC (rev 31621)
+++ scummvm/trunk/engines/m4/hotspot.h	2008-04-20 17:29:37 UTC (rev 31622)
@@ -97,7 +97,7 @@
 	int add(HotSpot *hotspot, bool head = false);
 	HotSpot *get(int index) { return _hotspots[index]; }
 	void remove(HotSpot *hotspot);
-	void unlink(HotSpot *hotspot);
+	void unlinkItem(HotSpot *hotspot);
 	void clear();
 	HotSpot *findByXY(int x, int y);
 	void setActive(const char *name, bool active);


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