From a24a5e77786266ee9456fa8c422a173168804a1f Mon Sep 17 00:00:00 2001 From: Ovah Date: Thu, 18 Jul 2019 15:52:03 +0200 Subject: Core/Movement: add a velocity argument for the spline chain meta table (PR #23575) (cherry picked from commit 3f7b2252a1d7d89d3b5e6a43aa10692c2bc8c457) --- src/server/game/Scripting/ScriptSystem.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/server/game/Scripting/ScriptSystem.cpp') diff --git a/src/server/game/Scripting/ScriptSystem.cpp b/src/server/game/Scripting/ScriptSystem.cpp index 90f01de55fb..33fbd62e244 100644 --- a/src/server/game/Scripting/ScriptSystem.cpp +++ b/src/server/game/Scripting/ScriptSystem.cpp @@ -94,9 +94,9 @@ void SystemMgr::LoadScriptSplineChains() m_mSplineChainsMap.clear(); - // 0 1 2 3 4 - QueryResult resultMeta = WorldDatabase.Query("SELECT entry, chainId, splineId, expectedDuration, msUntilNext FROM script_spline_chain_meta ORDER BY entry asc, chainId asc, splineId asc"); - // 0 1 2 3 4 5 6 + // 0 1 2 3 4 5 + QueryResult resultMeta = WorldDatabase.Query("SELECT entry, chainId, splineId, expectedDuration, msUntilNext, velocity FROM script_spline_chain_meta ORDER BY entry asc, chainId asc, splineId asc"); + // 0 1 2 3 4 5 6 QueryResult resultWP = WorldDatabase.Query("SELECT entry, chainId, splineId, wpId, x, y, z FROM script_spline_chain_waypoints ORDER BY entry asc, chainId asc, splineId asc, wpId asc"); if (!resultMeta || !resultWP) { @@ -121,7 +121,8 @@ void SystemMgr::LoadScriptSplineChains() uint32 expectedDuration = fieldsMeta[3].GetUInt32(); uint32 msUntilNext = fieldsMeta[4].GetUInt32(); - chain.emplace_back(expectedDuration, msUntilNext); + float velocity = fieldsMeta[5].GetFloat(); + chain.emplace_back(expectedDuration, msUntilNext, velocity); if (splineId == 0) ++chainCount; -- cgit v1.2.3