aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortreeston <treeston.mmoc@gmail.com>2016-09-20 12:45:11 +0200
committertreeston <treeston.mmoc@gmail.com>2016-09-20 12:45:11 +0200
commit4fa646c0b2ae3261e7fab249f4177900d4c8d013 (patch)
treea8c0de098b648549b83026c23f286b8904e43d80
parent20f483967fb3a430fbd54148c08b6d8e8937daac (diff)
Core/Movement: Add a convenience default ctor to SplineChainResumeInfo, and fix PCH build in some configurations (zzz why do we even keep Appveyor and Travis around).
-rw-r--r--src/server/game/Movement/Spline/SplineChain.h1
-rw-r--r--src/server/game/Scripting/ScriptSystem.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/server/game/Movement/Spline/SplineChain.h b/src/server/game/Movement/Spline/SplineChain.h
index 95d609a4620..bfb66eb7fee 100644
--- a/src/server/game/Movement/Spline/SplineChain.h
+++ b/src/server/game/Movement/Spline/SplineChain.h
@@ -33,6 +33,7 @@ typedef std::vector<SplineChainLink> SplineChain;
struct TC_GAME_API SplineChainResumeInfo
{
+ SplineChainResumeInfo() : PointID(0), Chain(nullptr), IsWalkMode(false), SplineIndex(0), PointIndex(0), TimeToNext(0) { }
SplineChainResumeInfo(uint32 id, SplineChain const* chain, bool walk, uint8 splineIndex, uint8 wpIndex, uint32 msToNext) :
PointID(id), Chain(chain), IsWalkMode(walk), SplineIndex(splineIndex), PointIndex(wpIndex), TimeToNext(msToNext) { }
uint32 PointID;
diff --git a/src/server/game/Scripting/ScriptSystem.h b/src/server/game/Scripting/ScriptSystem.h
index 2595fd093aa..bd6b9a4a294 100644
--- a/src/server/game/Scripting/ScriptSystem.h
+++ b/src/server/game/Scripting/ScriptSystem.h
@@ -6,6 +6,7 @@
#define SC_SYSTEM_H
#include "ScriptMgr.h"
+#include "SplineChain.h"
#define TEXT_SOURCE_RANGE -1000000 //the amount of entries each text source has available