diff options
| author | Subv <s.v.h21@hotmail.com> | 2012-10-04 19:39:09 -0500 |
|---|---|---|
| committer | Subv <s.v.h21@hotmail.com> | 2012-10-04 19:39:09 -0500 |
| commit | f7d3600e7e7ffaba971b77e4371a705e55593cfd (patch) | |
| tree | 2d4e898bb4e09ede5dba97918741597da6fd2d2e /src/server/game/Globals/ObjectMgr.cpp | |
| parent | d2437407f4f7ad1af3baeb351626b41bd700065c (diff) | |
| parent | 74707a08d3d63dc66e7b6943431c91f50258b0f9 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
Conflicts:
src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.cpp')
| -rwxr-xr-x | src/server/game/Globals/ObjectMgr.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 5ef9efa0396..fd2a2fe143a 100755 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -525,10 +525,10 @@ void ObjectMgr::LoadCreatureTemplateAddons() creatureAddon.bytes2 = fields[4].GetUInt32(); creatureAddon.emote = fields[5].GetUInt32(); - Tokens tokens(fields[6].GetString(), ' '); + Tokenizer tokens(fields[6].GetString(), ' '); uint8 i = 0; creatureAddon.auras.resize(tokens.size()); - for (Tokens::iterator itr = tokens.begin(); itr != tokens.end(); ++itr) + for (Tokenizer::const_iterator itr = tokens.begin(); itr != tokens.end(); ++itr) { SpellInfo const* AdditionalSpellInfo = sSpellMgr->GetSpellInfo(uint32(atol(*itr))); if (!AdditionalSpellInfo) @@ -907,10 +907,10 @@ void ObjectMgr::LoadCreatureAddons() creatureAddon.bytes2 = fields[4].GetUInt32(); creatureAddon.emote = fields[5].GetUInt32(); - Tokens tokens(fields[6].GetString(), ' '); + Tokenizer tokens(fields[6].GetString(), ' '); uint8 i = 0; creatureAddon.auras.resize(tokens.size()); - for (Tokens::iterator itr = tokens.begin(); itr != tokens.end(); ++itr) + for (Tokenizer::const_iterator itr = tokens.begin(); itr != tokens.end(); ++itr) { SpellInfo const* AdditionalSpellInfo = sSpellMgr->GetSpellInfo(uint32(atol(*itr))); if (!AdditionalSpellInfo) |