aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2019-11-01 14:54:34 +0100
committerShauren <shauren.trinity@gmail.com>2019-11-01 14:54:34 +0100
commit00656713161a511ffe0ce622f28575cf03ff2bf9 (patch)
treeeaa0c1f8074abf4f75b5739e844af416375a32b1 /src
parenteda48550f227c7144810db6ac7bb9116090bdfd1 (diff)
Nopch fix
Diffstat (limited to 'src')
-rw-r--r--src/server/game/AI/SmartScripts/SmartScript.cpp6
-rw-r--r--src/server/game/AI/SmartScripts/SmartScript.h7
-rw-r--r--src/server/game/Server/Packets/BattlegroundPackets.h1
3 files changed, 8 insertions, 6 deletions
diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp
index 58008eb5bcd..c7ffb21e25c 100644
--- a/src/server/game/AI/SmartScripts/SmartScript.cpp
+++ b/src/server/game/AI/SmartScripts/SmartScript.cpp
@@ -4485,3 +4485,9 @@ Unit* SmartScript::GetLastInvoker(Unit* invoker)
return nullptr;
}
+
+void SmartScript::IncPhase(uint32 p)
+{
+ // protect phase from overflowing
+ mEventPhase = std::min<uint32>(SMART_EVENT_PHASE_12, mEventPhase + p);
+}
diff --git a/src/server/game/AI/SmartScripts/SmartScript.h b/src/server/game/AI/SmartScripts/SmartScript.h
index bc6add0a058..8adb751132b 100644
--- a/src/server/game/AI/SmartScripts/SmartScript.h
+++ b/src/server/game/AI/SmartScripts/SmartScript.h
@@ -97,12 +97,7 @@ class TC_GAME_API SmartScript
CounterMap mCounterList;
private:
- void IncPhase(uint32 p)
- {
- // protect phase from overflowing
- mEventPhase = std::min<uint32>(SMART_EVENT_PHASE_12, mEventPhase + p);
- }
-
+ void IncPhase(uint32 p);
void DecPhase(uint32 p)
{
if (p >= mEventPhase)
diff --git a/src/server/game/Server/Packets/BattlegroundPackets.h b/src/server/game/Server/Packets/BattlegroundPackets.h
index 9f874005a3f..d1958af8bd2 100644
--- a/src/server/game/Server/Packets/BattlegroundPackets.h
+++ b/src/server/game/Server/Packets/BattlegroundPackets.h
@@ -24,6 +24,7 @@
#include "Optional.h"
#include "PacketUtilities.h"
#include "Position.h"
+#include <array>
namespace WorldPackets
{