From 3a3a6bbfd2d841f58cb6af191f969830ce852d8c Mon Sep 17 00:00:00 2001 From: Naios Date: Wed, 4 Nov 2015 20:06:20 +0100 Subject: Core/Globals: Use std::string rather than char* to pass script names around. (cherry picked from commit b7b49fe35f87e83813466cb302ff17381792e607) Conflicts: src/server/game/Battlegrounds/BattlegroundMgr.cpp src/server/game/Globals/ObjectMgr.cpp --- src/server/game/Conditions/ConditionMgr.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/server/game/Conditions/ConditionMgr.cpp') diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index 3675d43a3b4..d9fa125b64c 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -967,7 +967,7 @@ void ConditionMgr::LoadConditions(bool isReload) cond->NegativeCondition = fields[10].GetBool(); cond->ErrorType = fields[11].GetUInt32(); cond->ErrorTextId = fields[12].GetUInt32(); - cond->ScriptId = sObjectMgr->GetScriptId(fields[13].GetCString()); + cond->ScriptId = sObjectMgr->GetScriptId(fields[13].GetString()); if (iConditionTypeOrReference >= 0) cond->ConditionType = ConditionTypes(iConditionTypeOrReference); -- cgit v1.2.3