aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Maps/MapRefManager.h
diff options
context:
space:
mode:
authorariel- <ariel-@users.noreply.github.com>2016-10-06 23:14:51 -0300
committerjoschiwald <joschiwald.trinity@gmail.com>2017-08-21 21:49:36 +0200
commitec3dc0a43101dcbe2e469891acf0b654106eccfc (patch)
tree88f8c416d14b54fc5a71ba7f7cdb039aa66af44c /src/server/game/Maps/MapRefManager.h
parentab916fd1b37ca39071c2253be68e60ac2a735ada (diff)
Core/Misc: fix interaction of spells like Shadowmeld with Threat reducing effects
- SPELL_AURA_MOD_TOTAL_THREAT should be temporary and not added/subtracted from total, only computed - Cleanup of reference related code - Kill getLast() and reverse iterator obsevers, LinkedList iterator can't be used as a standard reverse_iterator (ie with operator++). They weren't used anyways (cherry picked from commit 3b6fd226bedb689847dadaeeba36a588ee9bc928) # Conflicts: # src/server/game/Combat/ThreatManager.cpp # src/server/game/Loot/LootMgr.h
Diffstat (limited to 'src/server/game/Maps/MapRefManager.h')
-rw-r--r--src/server/game/Maps/MapRefManager.h15
1 files changed, 6 insertions, 9 deletions
diff --git a/src/server/game/Maps/MapRefManager.h b/src/server/game/Maps/MapRefManager.h
index e318caae706..4b4a53d78fa 100644
--- a/src/server/game/Maps/MapRefManager.h
+++ b/src/server/game/Maps/MapRefManager.h
@@ -26,20 +26,17 @@ class MapReference;
class MapRefManager : public RefManager<Map, Player>
{
public:
- typedef LinkedListHead::Iterator< MapReference > iterator;
- typedef LinkedListHead::Iterator< MapReference const > const_iterator;
+ typedef LinkedListHead::Iterator<MapReference> iterator;
+ typedef LinkedListHead::Iterator<MapReference const> const_iterator;
- MapReference* getFirst() { return (MapReference*)RefManager<Map, Player>::getFirst(); }
+ MapReference* getFirst() { return (MapReference*)RefManager<Map, Player>::getFirst(); }
MapReference const* getFirst() const { return (MapReference const*)RefManager<Map, Player>::getFirst(); }
- MapReference* getLast() { return (MapReference*)RefManager<Map, Player>::getLast(); }
- MapReference const* getLast() const { return (MapReference const*)RefManager<Map, Player>::getLast(); }
iterator begin() { return iterator(getFirst()); }
- iterator end() { return iterator(NULL); }
- iterator rbegin() { return iterator(getLast()); }
- iterator rend() { return iterator(NULL); }
+ iterator end() { return iterator(nullptr); }
+
const_iterator begin() const { return const_iterator(getFirst()); }
- const_iterator end() const { return const_iterator(NULL); }
+ const_iterator end() const { return const_iterator(nullptr); }
};
#endif