mirror of
https://github.com/mangosfour/server.git
synced 2025-12-14 07:37:01 +00:00
[12071] Improve recent commits. Thanks to Reamer and stfx for pointing
This commit is contained in:
parent
8c93370a19
commit
7dc0a86237
7 changed files with 9 additions and 9 deletions
|
|
@ -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_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_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_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() override
|
TEMPFACTION_RESTORE_REACH_HOME = 0x04, // ... at reaching home in home movement (evade), if not already done at CombatStop()
|
||||||
TEMPFACTION_ALL,
|
TEMPFACTION_ALL,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -55,7 +55,7 @@ enum MMCleanFlag
|
||||||
{
|
{
|
||||||
MMCF_NONE = 0,
|
MMCF_NONE = 0,
|
||||||
MMCF_UPDATE = 1, // Clear or Expire called from update
|
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<MovementGenerator*>
|
class MANGOS_DLL_SPEC MotionMaster : private std::stack<MovementGenerator*>
|
||||||
|
|
|
||||||
|
|
@ -413,7 +413,7 @@ class MANGOS_DLL_SPEC WorldObject : public Object
|
||||||
public:
|
public:
|
||||||
|
|
||||||
// class is used to manipulate with WorldUpdateCounter
|
// 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
|
class MANGOS_DLL_SPEC UpdateHelper
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
|
@ -597,7 +597,7 @@ class MANGOS_DLL_SPEC WorldObject : public Object
|
||||||
explicit WorldObject();
|
explicit WorldObject();
|
||||||
|
|
||||||
// these functions are used mostly for Relocate() and Corpse/Player specific stuff...
|
// 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!
|
// mapId/instanceId should be set in SetMap() function!
|
||||||
void SetLocationMapId(uint32 _mapId) { m_mapId = _mapId; }
|
void SetLocationMapId(uint32 _mapId) { m_mapId = _mapId; }
|
||||||
void SetLocationInstanceId(uint32 _instanceId) { m_InstanceId = _instanceId; }
|
void SetLocationInstanceId(uint32 _instanceId) { m_InstanceId = _instanceId; }
|
||||||
|
|
|
||||||
|
|
@ -1363,7 +1363,7 @@ enum PacketProcessing
|
||||||
{
|
{
|
||||||
PROCESS_INPLACE = 0, // process packet whenever we receive it - mostly for non-handled or non-implemented packets
|
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_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;
|
class WorldPacket;
|
||||||
|
|
|
||||||
|
|
@ -1142,7 +1142,7 @@ class MANGOS_DLL_SPEC Unit : public WorldObject
|
||||||
if (itr == m_attackers.end())
|
if (itr == m_attackers.end())
|
||||||
m_attackers.insert(pAttacker);
|
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);
|
m_attackers.erase(pAttacker);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -169,7 +169,7 @@ void RealmList::UpdateRealms(bool init)
|
||||||
fields[8].GetFloat(), fields[9].GetCppString());
|
fields[8].GetFloat(), fields[9].GetCppString());
|
||||||
|
|
||||||
if (init)
|
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());
|
while (result->NextRow());
|
||||||
delete result;
|
delete result;
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#ifndef __REVISION_NR_H__
|
#ifndef __REVISION_NR_H__
|
||||||
#define __REVISION_NR_H__
|
#define __REVISION_NR_H__
|
||||||
#define REVISION_NR "12070"
|
#define REVISION_NR "12071"
|
||||||
#endif // __REVISION_NR_H__
|
#endif // __REVISION_NR_H__
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue