*Cleanup..

--HG--
branch : trunk

3 files changed, 10 insertions, 10 deletions

diff --git a/src/game/GameEventMgr.cpp b/src/game/GameEventMgr.cpp
index 22a4d7a7f13..640442bf052 100644
--- a/src/game/GameEventMgr.cpp
+++ b/src/game/GameEventMgr.cpp
@@ -1488,13 +1488,13 @@ bool GameEventMgr::hasGameObjectActiveEventExcept(uint32 go_id, uint16 event_id)
     return false;
 }
 
-void GameEventMgr::UpdateEventQuests(uint16 event_id, bool Activate)
+void GameEventMgr::UpdateEventQuests(uint16 event_id, bool activate)
 {
     QuestRelList::iterator itr;
     for (itr = mGameEventCreatureQuests[event_id].begin(); itr != mGameEventCreatureQuests[event_id].end(); ++itr)
     {
         QuestRelations &CreatureQuestMap = objmgr.mCreatureQuestRelations;
-        if (Activate)                                       // Add the pair(id,quest) to the multimap
+        if (activate)                                       // Add the pair(id,quest) to the multimap
             CreatureQuestMap.insert(QuestRelations::value_type(itr->first, itr->second));
         else
         {
@@ -1519,7 +1519,7 @@ void GameEventMgr::UpdateEventQuests(uint16 event_id, bool Activate)
     for (itr = mGameEventGameObjectQuests[event_id].begin(); itr != mGameEventGameObjectQuests[event_id].end(); ++itr)
     {
         QuestRelations &GameObjectQuestMap = objmgr.mGOQuestRelations;
-        if (Activate)                                       // Add the pair(id,quest) to the multimap
+        if (activate)                                       // Add the pair(id,quest) to the multimap
             GameObjectQuestMap.insert(QuestRelations::value_type(itr->first, itr->second));
         else
         {
diff --git a/src/game/GameEventMgr.h b/src/game/GameEventMgr.h
index e5c72524004..89f962a785b 100644
--- a/src/game/GameEventMgr.h
+++ b/src/game/GameEventMgr.h
@@ -26,14 +26,14 @@
 #include "Platform/Define.h"
 #include "Policies/Singleton.h"
 
-#define max_ge_check_delay 86400                            // 1 day in seconds
+#define max_ge_check_delay DAY  // 1 day in seconds
 
 enum GameEventState
 {
     GAMEEVENT_NORMAL = 0,   // standard game events
     GAMEEVENT_WORLD_INACTIVE = 1,   // not yet started
     GAMEEVENT_WORLD_CONDITIONS = 2,  // condition matching phase
-    GAMEEVENT_WORLD_NEXTPHASE = 3,   // conditions are met, now 'lenght' timer to start next event
+    GAMEEVENT_WORLD_NEXTPHASE = 3,   // conditions are met, now 'length' timer to start next event
     GAMEEVENT_WORLD_FINISHED = 4,    // next events are started, unapply this one
     GAMEEVENT_INTERNAL = 5, // never handled in update
 };
@@ -67,7 +67,7 @@ struct GameEventData
     std::set<uint16 /*gameevent id*/> prerequisite_events;  // events that must be completed before starting this event
     std::string description;
 
-    bool isValid() const { return ((length > 0) || (state > GAMEEVENT_NORMAL)); }
+    bool isValid() const { return length > 0 || state > GAMEEVENT_NORMAL; }
 };
 
 struct ModelEquip
@@ -121,7 +121,7 @@ class GameEventMgr
         void GameEventSpawn(int16 event_id);
         void GameEventUnspawn(int16 event_id);
         void ChangeEquipOrModel(int16 event_id, bool activate);
-        void UpdateEventQuests(uint16 event_id, bool Activate);
+        void UpdateEventQuests(uint16 event_id, bool activate);
         void UpdateEventNPCFlags(uint16 event_id);
         void UpdateEventNPCVendor(uint16 event_id, bool activate);
         void UpdateBattleGroundSettings();
diff --git a/src/game/SharedDefines.h b/src/game/SharedDefines.h
index c21ac2069a8..adc5f5ce78a 100644
--- a/src/game/SharedDefines.h
+++ b/src/game/SharedDefines.h
@@ -534,7 +534,7 @@ enum Language
     LANG_ZOMBIE         = 36,
     LANG_GNOMISH_BINARY = 37,
     LANG_GOBLIN_BINARY  = 38,
-    LANG_ADDON          = 0xFFFFFFFF                        // used by addons, in 2.4.0 not exit, replaced by messagetype?
+    LANG_ADDON          = 0xFFFFFFFF                        // used by addons, in 2.4.0 not exist, replaced by messagetype?
 };
 
 #define LANGUAGES_COUNT   19
@@ -1945,8 +1945,8 @@ enum CreatureTypeFlags
     CREATURE_TYPEFLAGS_UNK15           = 0x04000,           //? Possibly not in use
     CREATURE_TYPEFLAGS_ENGINEERLOOT    = 0x08000,           //can be looted by engineer
     CREATURE_TYPEFLAGS_EXOTIC          = 0x10000,           //can be tamed by hunter as exotic pet
-    CREATURE_TYPEFLAGS_UNK18           = 0x20000,           //? Related to veichles/pvp?
-    CREATURE_TYPEFLAGS_UNK19           = 0x40000,           //? Related to veichle/siege weapons?
+    CREATURE_TYPEFLAGS_UNK18           = 0x20000,           //? Related to vehicles/pvp?
+    CREATURE_TYPEFLAGS_UNK19           = 0x40000,           //? Related to vehicles/siege weapons?
     CREATURE_TYPEFLAGS_UNK20           = 0x80000
 };