aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Scripting/MapScripts.cpp
diff options
context:
space:
mode:
authorRat <gmstreetrat@gmail.com>2011-11-23 20:23:26 +0100
committerRat <gmstreetrat@gmail.com>2011-11-23 20:23:26 +0100
commit5d39e09d8909a9220a5fc156185c5d5473321d9f (patch)
tree950dc8db09aee5ac260840e63c7c446eb7782524 /src/server/game/Scripting/MapScripts.cpp
parent47d0a7f3afbb25d26dec8721801b13d4392aaf1d (diff)
parentafb2289d02fa3d7357b36aaf9065ddc579d00fc9 (diff)
Merge branch 'master' of github.com:TrinityCore/TrinityCore
Diffstat (limited to 'src/server/game/Scripting/MapScripts.cpp')
-rwxr-xr-xsrc/server/game/Scripting/MapScripts.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Scripting/MapScripts.cpp b/src/server/game/Scripting/MapScripts.cpp
index 88c9795e896..4236ef49212 100755
--- a/src/server/game/Scripting/MapScripts.cpp
+++ b/src/server/game/Scripting/MapScripts.cpp
@@ -321,11 +321,11 @@ void Map::ScriptsProcess()
source = HashMapHolder<Corpse>::Find(step.sourceGUID);
break;
case HIGHGUID_MO_TRANSPORT:
- for (MapManager::TransportSet::iterator iter = sMapMgr->m_Transports.begin(); iter != sMapMgr->m_Transports.end(); ++iter)
+ for (MapManager::TransportSet::iterator itr2 = sMapMgr->m_Transports.begin(); itr2 != sMapMgr->m_Transports.end(); ++itr2)
{
- if ((*iter)->GetGUID() == step.sourceGUID)
+ if ((*itr2)->GetGUID() == step.sourceGUID)
{
- source = *iter;
+ source = *itr2;
break;
}
}