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/Globals/ObjectMgr.h | |
| 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/Globals/ObjectMgr.h')
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h index 033ea482912..396be440205 100644 --- a/src/server/game/Globals/ObjectMgr.h +++ b/src/server/game/Globals/ObjectMgr.h @@ -1270,8 +1270,8 @@ class ObjectMgr bool IsVendorItemValid(uint32 vendor_entry, uint32 item, int32 maxcount, uint32 ptime, uint32 ExtendedCost, Player* player = NULL, std::set<uint32>* skip_vendors = NULL, uint32 ORnpcflag = 0) const; void LoadScriptNames(); - char const* GetScriptName(uint32 id) const { return id < _scriptNamesStore.size() ? _scriptNamesStore[id].c_str() : ""; } - uint32 GetScriptId(char const* name); + std::string const& GetScriptName(uint32 id) const; + uint32 GetScriptId(std::string const& name); SpellClickInfoMapBounds GetSpellClickInfoMapBounds(uint32 creature_id) const { |