From 3b6fd226bedb689847dadaeeba36a588ee9bc928 Mon Sep 17 00:00:00 2001 From: ariel- Date: Thu, 6 Oct 2016 23:14:51 -0300 Subject: 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 --- src/server/game/Maps/MapRefManager.h | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'src/server/game/Maps') diff --git a/src/server/game/Maps/MapRefManager.h b/src/server/game/Maps/MapRefManager.h index 09aa67d43eb..14d1d59bd36 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 { public: - typedef LinkedListHead::Iterator< MapReference > iterator; - typedef LinkedListHead::Iterator< MapReference const > const_iterator; + typedef LinkedListHead::Iterator iterator; + typedef LinkedListHead::Iterator const_iterator; - MapReference* getFirst() { return (MapReference*)RefManager::getFirst(); } + MapReference* getFirst() { return (MapReference*)RefManager::getFirst(); } MapReference const* getFirst() const { return (MapReference const*)RefManager::getFirst(); } - MapReference* getLast() { return (MapReference*)RefManager::getLast(); } - MapReference const* getLast() const { return (MapReference const*)RefManager::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 -- cgit v1.2.3