diff options
| author | Lars Persson | 2008-04-20 17:29:37 +0000 |
|---|---|---|
| committer | Lars Persson | 2008-04-20 17:29:37 +0000 |
| commit | 65e608f304e2249de9588fe05bea80c6d6657ea3 (patch) | |
| tree | 49d81575f1d0a8a72ce108790203a82e05db731c /engines/m4 | |
| parent | e06918c29f570bc07f29d0cdf20537cdcad5a63c (diff) | |
| download | scummvm-rg350-65e608f304e2249de9588fe05bea80c6d6657ea3.tar.gz scummvm-rg350-65e608f304e2249de9588fe05bea80c6d6657ea3.tar.bz2 scummvm-rg350-65e608f304e2249de9588fe05bea80c6d6657ea3.zip | |
unlink function name causing conflicts. Renaming to unlinkItem.
svn-id: r31622
Diffstat (limited to 'engines/m4')
| -rw-r--r-- | engines/m4/hotspot.cpp | 4 | ||||
| -rw-r--r-- | engines/m4/hotspot.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/m4/hotspot.cpp b/engines/m4/hotspot.cpp index bf791e09fc..48f568431b 100644 --- a/engines/m4/hotspot.cpp +++ b/engines/m4/hotspot.cpp @@ -125,11 +125,11 @@ int HotSpotList::add(HotSpot *hotspot, bool head) { } 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) { diff --git a/engines/m4/hotspot.h b/engines/m4/hotspot.h index bcd2aba919..0a0a7d6998 100644 --- a/engines/m4/hotspot.h +++ b/engines/m4/hotspot.h @@ -97,7 +97,7 @@ public: 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); |