From 7dc0a8623778bbb6449ea33bf77e1a217a332b06 Mon Sep 17 00:00:00 2001 From: Schmoozerd Date: Sun, 22 Jul 2012 15:49:46 +0200 Subject: [PATCH] [12071] Improve recent commits. Thanks to Reamer and stfx for pointing --- src/game/Creature.h | 4 ++-- src/game/MotionMaster.h | 2 +- src/game/Object.h | 4 ++-- src/game/Opcodes.h | 2 +- src/game/Unit.h | 2 +- src/realmd/RealmList.cpp | 2 +- src/shared/revision_nr.h | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/game/Creature.h b/src/game/Creature.h index f02859802..ec53023a2 100644 --- a/src/game/Creature.h +++ b/src/game/Creature.h @@ -447,8 +447,8 @@ enum TemporaryFactionFlags // Used at real fact { TEMPFACTION_NONE = 0x00, // When no flag is used in temporary faction change, faction will be persistent. It will then require manual change back to default/another faction when changed once TEMPFACTION_RESTORE_RESPAWN = 0x01, // Default faction will be restored at respawn - TEMPFACTION_RESTORE_COMBAT_STOP = 0x02, // ... at CombatStop() (happens at creature death, at evade or custom scripte among others) override - TEMPFACTION_RESTORE_REACH_HOME = 0x04, // ... at reaching home in home movement (evade), if not already done at CombatStop() override + TEMPFACTION_RESTORE_COMBAT_STOP = 0x02, // ... at CombatStop() (happens at creature death, at evade or custom scripte among others) + TEMPFACTION_RESTORE_REACH_HOME = 0x04, // ... at reaching home in home movement (evade), if not already done at CombatStop() TEMPFACTION_ALL, }; diff --git a/src/game/MotionMaster.h b/src/game/MotionMaster.h index 195ca2526..7cbc5e1ad 100644 --- a/src/game/MotionMaster.h +++ b/src/game/MotionMaster.h @@ -55,7 +55,7 @@ enum MMCleanFlag { MMCF_NONE = 0, MMCF_UPDATE = 1, // Clear or Expire called from update - MMCF_RESET = 2 // Flag if need top()->Reset() override + MMCF_RESET = 2 // Flag if need top()->Reset() }; class MANGOS_DLL_SPEC MotionMaster : private std::stack diff --git a/src/game/Object.h b/src/game/Object.h index 602c90186..450fc5fe1 100644 --- a/src/game/Object.h +++ b/src/game/Object.h @@ -413,7 +413,7 @@ class MANGOS_DLL_SPEC WorldObject : public Object public: // class is used to manipulate with WorldUpdateCounter - // it is needed in order to get time diff between two object's Update() override calls + // it is needed in order to get time diff between two object's Update() calls class MANGOS_DLL_SPEC UpdateHelper { public: @@ -597,7 +597,7 @@ class MANGOS_DLL_SPEC WorldObject : public Object explicit WorldObject(); // these functions are used mostly for Relocate() and Corpse/Player specific stuff... - // use them ONLY in LoadFromDB()/Create() override override funcs and nowhere else! + // use them ONLY in LoadFromDB()/Create() funcs and nowhere else! // mapId/instanceId should be set in SetMap() function! void SetLocationMapId(uint32 _mapId) { m_mapId = _mapId; } void SetLocationInstanceId(uint32 _instanceId) { m_InstanceId = _instanceId; } diff --git a/src/game/Opcodes.h b/src/game/Opcodes.h index bc4bd0f9d..e36907df2 100644 --- a/src/game/Opcodes.h +++ b/src/game/Opcodes.h @@ -1363,7 +1363,7 @@ enum PacketProcessing { PROCESS_INPLACE = 0, // process packet whenever we receive it - mostly for non-handled or non-implemented packets PROCESS_THREADUNSAFE, // packet is not thread-safe - process it in World::UpdateSessions() - PROCESS_THREADSAFE // packet is thread-safe - process it in Map::Update() override + PROCESS_THREADSAFE // packet is thread-safe - process it in Map::Update() }; class WorldPacket; diff --git a/src/game/Unit.h b/src/game/Unit.h index c31337d0c..07b456de1 100644 --- a/src/game/Unit.h +++ b/src/game/Unit.h @@ -1142,7 +1142,7 @@ class MANGOS_DLL_SPEC Unit : public WorldObject if (itr == m_attackers.end()) m_attackers.insert(pAttacker); } - void _removeAttacker(Unit* pAttacker) // must be called only from Unit::AttackStop() override + void _removeAttacker(Unit* pAttacker) // must be called only from Unit::AttackStop() { m_attackers.erase(pAttacker); } diff --git a/src/realmd/RealmList.cpp b/src/realmd/RealmList.cpp index d11024fcc..2625a71aa 100644 --- a/src/realmd/RealmList.cpp +++ b/src/realmd/RealmList.cpp @@ -169,7 +169,7 @@ void RealmList::UpdateRealms(bool init) fields[8].GetFloat(), fields[9].GetCppString()); if (init) - sLog.outString("Added realm \"%s\"", fields[1].GetString()); + sLog.outString("Added realm id %u, name '%s'", Id, name.c_str()); } while (result->NextRow()); delete result; diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 1b07c432c..c9d157aeb 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "12070" + #define REVISION_NR "12071" #endif // __REVISION_NR_H__