aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Scripting/ScriptSystem.h
diff options
context:
space:
mode:
authortreeston <treeston.mmoc@gmail.com>2016-09-20 20:19:15 +0200
committertreeston <treeston.mmoc@gmail.com>2016-09-20 20:19:15 +0200
commit2170541a51ced3c15675b8854e0ae49461884f8c (patch)
treefb297803f5f7e56380cd0d1c1c9fadc6daa4d96b /src/server/game/Scripting/ScriptSystem.h
parent3298a5f65dcbd21e93ddbe0d5c83bc06076b9f60 (diff)
Core/Unit: Standardize SetFacingTo and SetFacingToObject behavior while moving. Both now fail while moving unless arg2 bool is true.
Movement/SplineChain: Bump value range for DB chainId up to uint16 (0 to 65535) from uint8 (0 to 255). Turns out sniffs generate far more chains than I expected.
Diffstat (limited to 'src/server/game/Scripting/ScriptSystem.h')
-rw-r--r--src/server/game/Scripting/ScriptSystem.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Scripting/ScriptSystem.h b/src/server/game/Scripting/ScriptSystem.h
index 860ca08a3f3..2c8afa9c5ca 100644
--- a/src/server/game/Scripting/ScriptSystem.h
+++ b/src/server/game/Scripting/ScriptSystem.h
@@ -73,9 +73,9 @@ class TC_GAME_API SystemMgr
return &itr->second;
}
- SplineChain const* GetSplineChain(uint32 entry, uint8 id) const
+ SplineChain const* GetSplineChain(uint32 entry, uint16 chainId) const
{
- auto it = m_mSplineChainsMap.find({ entry, id });
+ auto it = m_mSplineChainsMap.find({ entry, chainId });
if (it == m_mSplineChainsMap.end())
return nullptr;
return &it->second;
@@ -85,7 +85,7 @@ class TC_GAME_API SystemMgr
protected:
PointMoveMap m_mPointMoveMap; //coordinates for waypoints
- typedef std::pair<uint32, uint8> ChainKeyType; // creature entry + chain ID
+ typedef std::pair<uint32, uint16> ChainKeyType; // creature entry + chain ID
std::unordered_map<ChainKeyType, SplineChain> m_mSplineChainsMap; // spline chains
};