From bd96262248fa4d9c8e867b4056e52c44852364c3 Mon Sep 17 00:00:00 2001 From: ariel- Date: Sun, 11 Jun 2017 21:41:11 +0200 Subject: Core/OutdoorPvP: refactor using Position and Quat to pack parameters - Moved statics to cpp - Save scriptids into an array (cherry picked from commit 3e7b64b2f765bebc722c1194b7fc2f749fae77f7) --- src/server/game/Scripting/ScriptMgr.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/server/game/Scripting/ScriptMgr.cpp') diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp index 668f4bba387..09528245993 100644 --- a/src/server/game/Scripting/ScriptMgr.cpp +++ b/src/server/game/Scripting/ScriptMgr.cpp @@ -1654,11 +1654,9 @@ Battleground* ScriptMgr::CreateBattleground(BattlegroundTypeId /*typeId*/) return NULL; } -OutdoorPvP* ScriptMgr::CreateOutdoorPvP(OutdoorPvPData const* data) +OutdoorPvP* ScriptMgr::CreateOutdoorPvP(uint32 scriptId) { - ASSERT(data); - - GET_SCRIPT_RET(OutdoorPvPScript, data->ScriptId, tmpscript, NULL); + GET_SCRIPT_RET(OutdoorPvPScript, scriptId, tmpscript, NULL); return tmpscript->GetOutdoorPvP(); } -- cgit v1.2.3