From 3a3a6bbfd2d841f58cb6af191f969830ce852d8c Mon Sep 17 00:00:00 2001
From: Naios <naios-dev@live.de>
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/Weather/WeatherMgr.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/server/game/Weather/WeatherMgr.cpp')

diff --git a/src/server/game/Weather/WeatherMgr.cpp b/src/server/game/Weather/WeatherMgr.cpp
index 64775a05faa..ff55d2d9a27 100644
--- a/src/server/game/Weather/WeatherMgr.cpp
+++ b/src/server/game/Weather/WeatherMgr.cpp
@@ -131,7 +131,7 @@ void LoadWeatherData()
             }
         }
 
-        wzc.ScriptId = sObjectMgr->GetScriptId(fields[13].GetCString());
+        wzc.ScriptId = sObjectMgr->GetScriptId(fields[13].GetString());
 
         ++count;
     }
-- 
cgit v1.2.3