From 205ec4c3bf26d74fefa2452baae714c56d956956 Mon Sep 17 00:00:00 2001 From: treeston Date: Tue, 20 Sep 2016 20:19:15 +0200 Subject: 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. (cherry picked from commit 2170541a51ced3c15675b8854e0ae49461884f8c) Code style follow-up, I blame Notepad++. (cherry picked from commit 7860da0de6e53c7740862cae18840c9d399dda7f) --- src/server/game/Scripting/ScriptSystem.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/server/game/Scripting/ScriptSystem.h') diff --git a/src/server/game/Scripting/ScriptSystem.h b/src/server/game/Scripting/ScriptSystem.h index 6086b10e2be..7bce7b2e69e 100644 --- a/src/server/game/Scripting/ScriptSystem.h +++ b/src/server/game/Scripting/ScriptSystem.h @@ -87,9 +87,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; @@ -99,7 +99,7 @@ class TC_GAME_API SystemMgr protected: PointMoveMap m_mPointMoveMap; //coordinates for waypoints - typedef std::pair ChainKeyType; // creature entry + chain ID + typedef std::pair ChainKeyType; // creature entry + chain ID std::unordered_map m_mSplineChainsMap; // spline chains }; -- cgit v1.2.3