From 5efacc3dddf72764efe6bb240687f71d31270db1 Mon Sep 17 00:00:00 2001 From: Rochet2 Date: Fri, 19 Oct 2018 04:44:15 +0300 Subject: [PATCH] Fix non PCH build and update Eluna --- src/game/MotionGenerators/PathFinder.cpp | 1 + src/game/Object/CreatureAI.cpp | 5 +++++ src/game/Object/CreatureAI.h | 3 ++- src/game/Object/PlayerLogger.cpp | 10 +++++----- src/game/Object/PlayerLogger.h | 15 ++++++++++----- src/game/Server/Opcodes.h | 1 + src/game/Warden/Warden.cpp | 1 + src/game/WorldHandlers/DisableMgr.cpp | 1 + src/game/WorldHandlers/InstanceData.h | 1 + src/game/WorldHandlers/LootHandler.cpp | 1 + src/game/WorldHandlers/MoveMap.h | 1 + src/game/WorldHandlers/World.cpp | 1 + src/modules/Eluna | 2 +- 13 files changed, 31 insertions(+), 12 deletions(-) diff --git a/src/game/MotionGenerators/PathFinder.cpp b/src/game/MotionGenerators/PathFinder.cpp index 36739512..1056f036 100644 --- a/src/game/MotionGenerators/PathFinder.cpp +++ b/src/game/MotionGenerators/PathFinder.cpp @@ -27,6 +27,7 @@ #include "MoveMap.h" #include "GridMap.h" #include "Creature.h" +#include "Map.h" #include "PathFinder.h" #include "Log.h" diff --git a/src/game/Object/CreatureAI.cpp b/src/game/Object/CreatureAI.cpp index 687ebc76..acb0774e 100644 --- a/src/game/Object/CreatureAI.cpp +++ b/src/game/Object/CreatureAI.cpp @@ -41,6 +41,11 @@ CreatureAI::~CreatureAI() { } +void CreatureAI::EnterEvadeMode() +{ + m_creature->ResetPlayerDamageReq(); +} + void CreatureAI::AttackedBy(Unit* attacker) { if (!m_creature->getVictim()) diff --git a/src/game/Object/CreatureAI.h b/src/game/Object/CreatureAI.h index 48e756db..4994ac5a 100644 --- a/src/game/Object/CreatureAI.h +++ b/src/game/Object/CreatureAI.h @@ -28,6 +28,7 @@ #include "Platform/Define.h" #include "Dynamic/FactoryHolder.h" #include "ObjectGuid.h" +#include "SharedDefines.h" class WorldObject; class GameObject; @@ -137,7 +138,7 @@ class CreatureAI * Called for reaction at stopping attack at no attackers or targets * 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 diff --git a/src/game/Object/PlayerLogger.cpp b/src/game/Object/PlayerLogger.cpp index 76fff603..07f64a7c 100644 --- a/src/game/Object/PlayerLogger.cpp +++ b/src/game/Object/PlayerLogger.cpp @@ -28,7 +28,7 @@ #include "World.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) 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)) return; @@ -326,7 +326,7 @@ void PlayerLogger::LogDamage(bool done, uint16 damage, uint16 heal, ObjectGuid u ((std::vector*)(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)) return; @@ -338,7 +338,7 @@ void PlayerLogger::LogLooting(LootSourceType type, ObjectGuid droppedBy, ObjectG ((std::vector*)(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)) return; @@ -350,7 +350,7 @@ void PlayerLogger::LogTrading(bool aquire, ObjectGuid partner, ObjectGuid itemGu ((std::vector*)(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)) return; diff --git a/src/game/Object/PlayerLogger.h b/src/game/Object/PlayerLogger.h index 4688a6a0..ba8d4632 100644 --- a/src/game/Object/PlayerLogger.h +++ b/src/game/Object/PlayerLogger.h @@ -25,6 +25,11 @@ #ifndef MANGOS_H_PLAYERLOGGER #define MANGOS_H_PLAYERLOGGER +#include "Platform/Define.h" +#include +class Player; +class ObjectGuid; + enum PlayerLogEntity { PLAYER_LOG_DAMAGE_GET = 0, @@ -147,7 +152,7 @@ struct PlayerLogProgress : public PlayerLogPosition // 18+4=22 bytes class PlayerLogger { public: - PlayerLogger(ObjectGuid); + PlayerLogger(ObjectGuid const & guid); ~PlayerLogger(); static inline PlayerLogMask CalcLogMask(PlayerLogEntity entity) { return PlayerLogMask(1 << entity); } @@ -178,10 +183,10 @@ public: void CheckAndTruncate(PlayerLogMask, uint32 maxRecords); // logging itself - void LogDamage(bool done, uint16 damage, uint16 heal, ObjectGuid unitGuid, uint16 spell); - void LogLooting(LootSourceType type, ObjectGuid droppedBy, ObjectGuid itemGuid, uint32 id); - void LogTrading(bool aquire, ObjectGuid partner, ObjectGuid itemGuid); - void LogKilling(bool killedEnemy, ObjectGuid unitGuid); + void LogDamage(bool done, uint16 damage, uint16 heal, ObjectGuid const & unitGuid, uint16 spell); + void LogLooting(LootSourceType type, ObjectGuid const & droppedBy, ObjectGuid const & itemGuid, uint32 id); + void LogTrading(bool aquire, ObjectGuid const & partner, ObjectGuid const & itemGuid); + void LogKilling(bool killedEnemy, ObjectGuid const & unitGuid); void LogPosition(); void LogProgress(ProgressType type, uint8 achieve, uint16 misc = 0); diff --git a/src/game/Server/Opcodes.h b/src/game/Server/Opcodes.h index 86183040..bc77c799 100644 --- a/src/game/Server/Opcodes.h +++ b/src/game/Server/Opcodes.h @@ -30,6 +30,7 @@ #define MANGOS_H_OPCODES #include "Common.h" +#include "Policies/Singleton.h" // 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 diff --git a/src/game/Warden/Warden.cpp b/src/game/Warden/Warden.cpp index cbc62023..37219e40 100644 --- a/src/game/Warden/Warden.cpp +++ b/src/game/Warden/Warden.cpp @@ -28,6 +28,7 @@ #include "WorldSession.h" #include "Log.h" #include "Opcodes.h" +#include "Player.h" #include "ByteBuffer.h" #include #include "World.h" diff --git a/src/game/WorldHandlers/DisableMgr.cpp b/src/game/WorldHandlers/DisableMgr.cpp index c3ab7d0c..412089af 100644 --- a/src/game/WorldHandlers/DisableMgr.cpp +++ b/src/game/WorldHandlers/DisableMgr.cpp @@ -22,6 +22,7 @@ #include "OutdoorPvPMgr.h" #include "SpellMgr.h" #include "Player.h" +#include "ProgressBar.h" #include "World.h" #include "BattleGroundMgr.h" diff --git a/src/game/WorldHandlers/InstanceData.h b/src/game/WorldHandlers/InstanceData.h index 66da92da..6059ae00 100644 --- a/src/game/WorldHandlers/InstanceData.h +++ b/src/game/WorldHandlers/InstanceData.h @@ -26,6 +26,7 @@ #define MANGOS_INSTANCE_DATA_H #include "Common.h" +#include "LootMgr.h" #include "ObjectGuid.h" class Map; diff --git a/src/game/WorldHandlers/LootHandler.cpp b/src/game/WorldHandlers/LootHandler.cpp index b20cc64b..a6aa38a3 100644 --- a/src/game/WorldHandlers/LootHandler.cpp +++ b/src/game/WorldHandlers/LootHandler.cpp @@ -31,6 +31,7 @@ #include "WorldSession.h" #include "LootMgr.h" #include "Object.h" +#include "GameObject.h" #include "Group.h" #include "World.h" diff --git a/src/game/WorldHandlers/MoveMap.h b/src/game/WorldHandlers/MoveMap.h index 79ac8984..3bc78f1e 100644 --- a/src/game/WorldHandlers/MoveMap.h +++ b/src/game/WorldHandlers/MoveMap.h @@ -29,6 +29,7 @@ #include "../../dep/recastnavigation/Detour/Include/DetourNavMesh.h" #include "../../dep/recastnavigation/Detour/Include/DetourNavMeshQuery.h" +#include "Platform/Define.h" #include "Utilities/UnorderedMapSet.h" class Unit; diff --git a/src/game/WorldHandlers/World.cpp b/src/game/WorldHandlers/World.cpp index a8a29863..94e21a6d 100644 --- a/src/game/WorldHandlers/World.cpp +++ b/src/game/WorldHandlers/World.cpp @@ -50,6 +50,7 @@ #include "MapManager.h" #include "ScriptMgr.h" #include "CreatureAIRegistry.h" +#include "ProgressBar.h" #include "Policies/Singleton.h" #include "BattleGround/BattleGroundMgr.h" #include "OutdoorPvP/OutdoorPvP.h" diff --git a/src/modules/Eluna b/src/modules/Eluna index 25b7700b..8697e932 160000 --- a/src/modules/Eluna +++ b/src/modules/Eluna @@ -1 +1 @@ -Subproject commit 25b7700b0f0ba710e19dbbfb6276f1e170ed4dc4 +Subproject commit 8697e932ae303bda270cc8f8abd048a90fafbe8d