diff options
| author | click <clickvd@gonnamakeyou.com> | 2011-06-11 22:35:29 +0200 |
|---|---|---|
| committer | click <clickvd@gonnamakeyou.com> | 2011-06-11 22:35:29 +0200 |
| commit | 158966dc793f47dd4ada264da775f647601298aa (patch) | |
| tree | 8fa1dc1cc36d07123662c32eb5981cfac01e91b6 /src/server/game/Events | |
| parent | 9ef8bd307200445f448a67d1bb26c3afee9b7051 (diff) | |
Core: Codestyle cleanup
Diffstat (limited to 'src/server/game/Events')
| -rwxr-xr-x | src/server/game/Events/GameEventMgr.cpp | 8 | ||||
| -rwxr-xr-x | src/server/game/Events/GameEventMgr.h | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp index 582a389d1fb..eccbf9b2950 100755 --- a/src/server/game/Events/GameEventMgr.cpp +++ b/src/server/game/Events/GameEventMgr.cpp @@ -910,7 +910,7 @@ void GameEventMgr::LoadFromDB() } } -uint32 GameEventMgr::GetNPCFlag(Creature * cr) +uint32 GameEventMgr::GetNPCFlag(Creature* cr) { uint32 mask = 0; uint32 guid = cr->GetDBTableGUIDLow(); @@ -1109,7 +1109,7 @@ void GameEventMgr::UpdateEventNPCFlags(uint16 event_id) // get the creature data from the low guid to get the entry, to be able to find out the whole guid if (CreatureData const* data = sObjectMgr->GetCreatureData(itr->first)) { - Creature * cr = HashMapHolder<Creature>::Find(MAKE_NEW_GUID(itr->first, data->id, HIGHGUID_UNIT)); + Creature* cr = HashMapHolder<Creature>::Find(MAKE_NEW_GUID(itr->first, data->id, HIGHGUID_UNIT)); // if we found the creature, modify its npcflag if (cr) { @@ -1480,7 +1480,7 @@ void GameEventMgr::UpdateWorldStates(uint16 event_id, bool Activate) BattlegroundTypeId bgTypeId = BattlegroundMgr::WeekendHolidayIdToBGType(event.holiday_id); if (bgTypeId != BATTLEGROUND_TYPE_NONE) { - BattlemasterListEntry const * bl = sBattlemasterListStore.LookupEntry(bgTypeId); + BattlemasterListEntry const* bl = sBattlemasterListStore.LookupEntry(bgTypeId); if (bl && bl->HolidayWorldStateId) { WorldPacket data; @@ -1583,7 +1583,7 @@ void GameEventMgr::SaveWorldEventStateToDB(uint16 event_id) CharacterDatabase.CommitTransaction(trans); } -void GameEventMgr::SendWorldStateUpdate(Player * plr, uint16 event_id) +void GameEventMgr::SendWorldStateUpdate(Player* plr, uint16 event_id) { std::map<uint32, GameEventFinishCondition>::iterator itr; for (itr = mGameEvent[event_id].conditions.begin(); itr !=mGameEvent[event_id].conditions.end(); ++itr) diff --git a/src/server/game/Events/GameEventMgr.h b/src/server/game/Events/GameEventMgr.h index 8e71d4f5a13..80cd8262515 100755 --- a/src/server/game/Events/GameEventMgr.h +++ b/src/server/game/Events/GameEventMgr.h @@ -111,11 +111,11 @@ class GameEventMgr bool StartEvent(uint16 event_id, bool overwrite = false); void StopEvent(uint16 event_id, bool overwrite = false); void HandleQuestComplete(uint32 quest_id); // called on world event type quest completions - void HandleWorldEventGossip(Player * plr, Creature * c); - uint32 GetNPCFlag(Creature * cr); + void HandleWorldEventGossip(Player* plr, Creature* c); + uint32 GetNPCFlag(Creature* cr); uint32 GetNpcTextId(uint32 guid); private: - void SendWorldStateUpdate(Player * plr, uint16 event_id); + void SendWorldStateUpdate(Player* plr, uint16 event_id); void AddActiveEvent(uint16 event_id) { m_ActiveEvents.insert(event_id); } void RemoveActiveEvent(uint16 event_id) { m_ActiveEvents.erase(event_id); } void ApplyNewEvent(uint16 event_id); |
