Fix non PCH build and update Eluna

This commit is contained in:
Rochet2 2018-10-19 04:44:15 +03:00
parent 59bad5ae48
commit 5efacc3ddd
13 changed files with 31 additions and 12 deletions

View File

@ -27,6 +27,7 @@
#include "MoveMap.h" #include "MoveMap.h"
#include "GridMap.h" #include "GridMap.h"
#include "Creature.h" #include "Creature.h"
#include "Map.h"
#include "PathFinder.h" #include "PathFinder.h"
#include "Log.h" #include "Log.h"

View File

@ -41,6 +41,11 @@ CreatureAI::~CreatureAI()
{ {
} }
void CreatureAI::EnterEvadeMode()
{
m_creature->ResetPlayerDamageReq();
}
void CreatureAI::AttackedBy(Unit* attacker) void CreatureAI::AttackedBy(Unit* attacker)
{ {
if (!m_creature->getVictim()) if (!m_creature->getVictim())

View File

@ -28,6 +28,7 @@
#include "Platform/Define.h" #include "Platform/Define.h"
#include "Dynamic/FactoryHolder.h" #include "Dynamic/FactoryHolder.h"
#include "ObjectGuid.h" #include "ObjectGuid.h"
#include "SharedDefines.h"
class WorldObject; class WorldObject;
class GameObject; class GameObject;
@ -137,7 +138,7 @@ class CreatureAI
* Called for reaction at stopping attack at no attackers or targets * Called for reaction at stopping attack at no attackers or targets
* This is called usually in Unit::SelectHostileTarget, if no more target exists * This is called usually in Unit::SelectHostileTarget, if no more target exists
*/ */
virtual void EnterEvadeMode() { m_creature->ResetPlayerDamageReq(); } virtual void EnterEvadeMode();
/** /**
* Called at reaching home after MoveTargetedHome * Called at reaching home after MoveTargetedHome

View File

@ -28,7 +28,7 @@
#include "World.h" #include "World.h"
#include "Log.h" #include "Log.h"
PlayerLogger::PlayerLogger(ObjectGuid guid) : logActiveMask(0), playerGuid(guid.GetCounter()) PlayerLogger::PlayerLogger(ObjectGuid const & guid) : logActiveMask(0), playerGuid(guid.GetCounter())
{ {
for (uint8 i = 0; i < MAX_PLAYER_LOG_ENTITIES; ++i) for (uint8 i = 0; i < MAX_PLAYER_LOG_ENTITIES; ++i)
data[i] = NULL; data[i] = NULL;
@ -314,7 +314,7 @@ void PlayerLogger::CheckAndTruncate(PlayerLogMask mask, uint32 maxRecords)
} }
} }
void PlayerLogger::LogDamage(bool done, uint16 damage, uint16 heal, ObjectGuid unitGuid, uint16 spell) void PlayerLogger::LogDamage(bool done, uint16 damage, uint16 heal, ObjectGuid const & unitGuid, uint16 spell)
{ {
if (!IsLoggingActive(done ? PLAYER_LOGMASK_DAMAGE_DONE : PLAYER_LOGMASK_DAMAGE_GET)) if (!IsLoggingActive(done ? PLAYER_LOGMASK_DAMAGE_DONE : PLAYER_LOGMASK_DAMAGE_GET))
return; return;
@ -326,7 +326,7 @@ void PlayerLogger::LogDamage(bool done, uint16 damage, uint16 heal, ObjectGuid u
((std::vector<PlayerLogDamage>*)(data[done ? PLAYER_LOG_DAMAGE_DONE : PLAYER_LOG_DAMAGE_GET]))->push_back(log); ((std::vector<PlayerLogDamage>*)(data[done ? PLAYER_LOG_DAMAGE_DONE : PLAYER_LOG_DAMAGE_GET]))->push_back(log);
} }
void PlayerLogger::LogLooting(LootSourceType type, ObjectGuid droppedBy, ObjectGuid itemGuid, uint32 id) void PlayerLogger::LogLooting(LootSourceType type, ObjectGuid const & droppedBy, ObjectGuid const & itemGuid, uint32 id)
{ {
if (!IsLoggingActive(PLAYER_LOGMASK_LOOTING)) if (!IsLoggingActive(PLAYER_LOGMASK_LOOTING))
return; return;
@ -338,7 +338,7 @@ void PlayerLogger::LogLooting(LootSourceType type, ObjectGuid droppedBy, ObjectG
((std::vector<PlayerLogLooting>*)(data[PLAYER_LOG_LOOTING]))->push_back(log); ((std::vector<PlayerLogLooting>*)(data[PLAYER_LOG_LOOTING]))->push_back(log);
} }
void PlayerLogger::LogTrading(bool aquire, ObjectGuid partner, ObjectGuid itemGuid) void PlayerLogger::LogTrading(bool aquire, ObjectGuid const & partner, ObjectGuid const & itemGuid)
{ {
if (!IsLoggingActive(PLAYER_LOGMASK_TRADE)) if (!IsLoggingActive(PLAYER_LOGMASK_TRADE))
return; return;
@ -350,7 +350,7 @@ void PlayerLogger::LogTrading(bool aquire, ObjectGuid partner, ObjectGuid itemGu
((std::vector<PlayerLogTrading>*)(data[PLAYER_LOG_TRADE]))->push_back(log); ((std::vector<PlayerLogTrading>*)(data[PLAYER_LOG_TRADE]))->push_back(log);
} }
void PlayerLogger::LogKilling(bool killedEnemy, ObjectGuid unitGuid) void PlayerLogger::LogKilling(bool killedEnemy, ObjectGuid const & unitGuid)
{ {
if (!IsLoggingActive(PLAYER_LOGMASK_KILL)) if (!IsLoggingActive(PLAYER_LOGMASK_KILL))
return; return;

View File

@ -25,6 +25,11 @@
#ifndef MANGOS_H_PLAYERLOGGER #ifndef MANGOS_H_PLAYERLOGGER
#define MANGOS_H_PLAYERLOGGER #define MANGOS_H_PLAYERLOGGER
#include "Platform/Define.h"
#include <vector>
class Player;
class ObjectGuid;
enum PlayerLogEntity enum PlayerLogEntity
{ {
PLAYER_LOG_DAMAGE_GET = 0, PLAYER_LOG_DAMAGE_GET = 0,
@ -147,7 +152,7 @@ struct PlayerLogProgress : public PlayerLogPosition // 18+4=22 bytes
class PlayerLogger class PlayerLogger
{ {
public: public:
PlayerLogger(ObjectGuid); PlayerLogger(ObjectGuid const & guid);
~PlayerLogger(); ~PlayerLogger();
static inline PlayerLogMask CalcLogMask(PlayerLogEntity entity) { return PlayerLogMask(1 << entity); } static inline PlayerLogMask CalcLogMask(PlayerLogEntity entity) { return PlayerLogMask(1 << entity); }
@ -178,10 +183,10 @@ public:
void CheckAndTruncate(PlayerLogMask, uint32 maxRecords); void CheckAndTruncate(PlayerLogMask, uint32 maxRecords);
// logging itself // logging itself
void LogDamage(bool done, uint16 damage, uint16 heal, ObjectGuid unitGuid, uint16 spell); void LogDamage(bool done, uint16 damage, uint16 heal, ObjectGuid const & unitGuid, uint16 spell);
void LogLooting(LootSourceType type, ObjectGuid droppedBy, ObjectGuid itemGuid, uint32 id); void LogLooting(LootSourceType type, ObjectGuid const & droppedBy, ObjectGuid const & itemGuid, uint32 id);
void LogTrading(bool aquire, ObjectGuid partner, ObjectGuid itemGuid); void LogTrading(bool aquire, ObjectGuid const & partner, ObjectGuid const & itemGuid);
void LogKilling(bool killedEnemy, ObjectGuid unitGuid); void LogKilling(bool killedEnemy, ObjectGuid const & unitGuid);
void LogPosition(); void LogPosition();
void LogProgress(ProgressType type, uint8 achieve, uint16 misc = 0); void LogProgress(ProgressType type, uint8 achieve, uint16 misc = 0);

View File

@ -30,6 +30,7 @@
#define MANGOS_H_OPCODES #define MANGOS_H_OPCODES
#include "Common.h" #include "Common.h"
#include "Policies/Singleton.h"
// Note: this include need for be sure have full definition of class WorldSession // Note: this include need for be sure have full definition of class WorldSession
// if this class definition not complite then VS for x64 release use different size for // if this class definition not complite then VS for x64 release use different size for

View File

@ -28,6 +28,7 @@
#include "WorldSession.h" #include "WorldSession.h"
#include "Log.h" #include "Log.h"
#include "Opcodes.h" #include "Opcodes.h"
#include "Player.h"
#include "ByteBuffer.h" #include "ByteBuffer.h"
#include <openssl/sha.h> #include <openssl/sha.h>
#include "World.h" #include "World.h"

View File

@ -22,6 +22,7 @@
#include "OutdoorPvPMgr.h" #include "OutdoorPvPMgr.h"
#include "SpellMgr.h" #include "SpellMgr.h"
#include "Player.h" #include "Player.h"
#include "ProgressBar.h"
#include "World.h" #include "World.h"
#include "BattleGroundMgr.h" #include "BattleGroundMgr.h"

View File

@ -26,6 +26,7 @@
#define MANGOS_INSTANCE_DATA_H #define MANGOS_INSTANCE_DATA_H
#include "Common.h" #include "Common.h"
#include "LootMgr.h"
#include "ObjectGuid.h" #include "ObjectGuid.h"
class Map; class Map;

View File

@ -31,6 +31,7 @@
#include "WorldSession.h" #include "WorldSession.h"
#include "LootMgr.h" #include "LootMgr.h"
#include "Object.h" #include "Object.h"
#include "GameObject.h"
#include "Group.h" #include "Group.h"
#include "World.h" #include "World.h"

View File

@ -29,6 +29,7 @@
#include "../../dep/recastnavigation/Detour/Include/DetourNavMesh.h" #include "../../dep/recastnavigation/Detour/Include/DetourNavMesh.h"
#include "../../dep/recastnavigation/Detour/Include/DetourNavMeshQuery.h" #include "../../dep/recastnavigation/Detour/Include/DetourNavMeshQuery.h"
#include "Platform/Define.h"
#include "Utilities/UnorderedMapSet.h" #include "Utilities/UnorderedMapSet.h"
class Unit; class Unit;

View File

@ -50,6 +50,7 @@
#include "MapManager.h" #include "MapManager.h"
#include "ScriptMgr.h" #include "ScriptMgr.h"
#include "CreatureAIRegistry.h" #include "CreatureAIRegistry.h"
#include "ProgressBar.h"
#include "Policies/Singleton.h" #include "Policies/Singleton.h"
#include "BattleGround/BattleGroundMgr.h" #include "BattleGround/BattleGroundMgr.h"
#include "OutdoorPvP/OutdoorPvP.h" #include "OutdoorPvP/OutdoorPvP.h"

@ -1 +1 @@
Subproject commit 25b7700b0f0ba710e19dbbfb6276f1e170ed4dc4 Subproject commit 8697e932ae303bda270cc8f8abd048a90fafbe8d