diff options
| author | Naios <naios-dev@live.de> | 2015-11-04 20:06:20 +0100 |
|---|---|---|
| committer | Carbenium <carbenium@outlook.com> | 2015-11-07 13:09:10 +0100 |
| commit | 3a3a6bbfd2d841f58cb6af191f969830ce852d8c (patch) | |
| tree | 47aaef336804899237f6e0f36daebff0cbc1b0c2 /src/server/game/Battlegrounds/BattlegroundMgr.cpp | |
| parent | 23153c8bf168175c28fe6f1b20f3c0507c75f316 (diff) | |
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
Diffstat (limited to 'src/server/game/Battlegrounds/BattlegroundMgr.cpp')
| -rw-r--r-- | src/server/game/Battlegrounds/BattlegroundMgr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Battlegrounds/BattlegroundMgr.cpp b/src/server/game/Battlegrounds/BattlegroundMgr.cpp index 5bdaf0e661d..3aac3f080f2 100644 --- a/src/server/game/Battlegrounds/BattlegroundMgr.cpp +++ b/src/server/game/Battlegrounds/BattlegroundMgr.cpp @@ -549,7 +549,7 @@ void BattlegroundMgr::LoadBattlegroundTemplates() float dist = fields[9].GetFloat(); bgTemplate.MaxStartDistSq = dist * dist; bgTemplate.Weight = fields[10].GetUInt8(); - bgTemplate.ScriptId = sObjectMgr->GetScriptId(fields[11].GetCString()); + bgTemplate.ScriptId = sObjectMgr->GetScriptId(fields[11].GetString()); bgTemplate.BattlemasterEntry = bl; if (bgTemplate.MaxPlayersPerTeam == 0 || bgTemplate.MinPlayersPerTeam > bgTemplate.MaxPlayersPerTeam) |