aboutsummaryrefslogtreecommitdiff
path: root/src/game/ObjectGridLoader.cpp
diff options
context:
space:
mode:
authormegamage <none@none>2009-04-08 12:28:41 -0500
committermegamage <none@none>2009-04-08 12:28:41 -0500
commit74d553bc4caad3e35922463ec9d327c7fb741496 (patch)
tree7cfd1767e7fa09d5384a97b5feb7d0c3f59b5036 /src/game/ObjectGridLoader.cpp
parentfc7d2a5393175c460c325f9f778a95aaf67388d3 (diff)
parent2ebeb198add74c6d4bf73bf687e7e747355dbfe3 (diff)
*Merge.
--HG-- branch : trunk
Diffstat (limited to 'src/game/ObjectGridLoader.cpp')
-rw-r--r--src/game/ObjectGridLoader.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/game/ObjectGridLoader.cpp b/src/game/ObjectGridLoader.cpp
index be9ac9f53db..d3e8397baaa 100644
--- a/src/game/ObjectGridLoader.cpp
+++ b/src/game/ObjectGridLoader.cpp
@@ -54,11 +54,10 @@ ObjectGridRespawnMover::Visit(CreatureMapType &m)
// creature in unloading grid can have respawn point in another grid
// if it will be unloaded then it will not respawn in original grid until unload/load original grid
// move to respawn point to prevent this case. For player view in respawn grid this will be normal respawn.
- for(CreatureMapType::iterator iter=m.begin(), next; iter != m.end(); iter = next)
+ for(CreatureMapType::iterator iter = m.begin(); iter != m.end();)
{
- next = iter; ++next;
-
Creature * c = iter->getSource();
+ ++iter;
assert(!c->isWorldCreature() && "ObjectGridRespawnMover don't must be called for pets");