summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-11-27 23:15:08 +0100
committerMattes D <github@xoft.cz>2014-11-27 23:15:08 +0100
commit1480cdb944b0c81efbaeb47ae1bf8b153d7d98fe (patch)
treeecbdc082281e820fc98a302add93400ba467dbd7
parentOctavedNoise: Another unshadowed local variable. (diff)
downloadcuberite-1480cdb944b0c81efbaeb47ae1bf8b153d7d98fe.tar
cuberite-1480cdb944b0c81efbaeb47ae1bf8b153d7d98fe.tar.gz
cuberite-1480cdb944b0c81efbaeb47ae1bf8b153d7d98fe.tar.bz2
cuberite-1480cdb944b0c81efbaeb47ae1bf8b153d7d98fe.tar.lz
cuberite-1480cdb944b0c81efbaeb47ae1bf8b153d7d98fe.tar.xz
cuberite-1480cdb944b0c81efbaeb47ae1bf8b153d7d98fe.tar.zst
cuberite-1480cdb944b0c81efbaeb47ae1bf8b153d7d98fe.zip
Diffstat (limited to '')
-rw-r--r--src/Chunk.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Chunk.cpp b/src/Chunk.cpp
index d9333afc7..a2a11f130 100644
--- a/src/Chunk.cpp
+++ b/src/Chunk.cpp
@@ -1869,18 +1869,18 @@ bool cChunk::AddClient(cClientHandle * a_Client)
void cChunk::RemoveClient(cClientHandle * a_Client)
{
- for (cClientHandleList::iterator itr = m_LoadedByClient.begin(); itr != m_LoadedByClient.end(); ++itr)
+ for (cClientHandleList::iterator itrC = m_LoadedByClient.begin(); itrC != m_LoadedByClient.end(); ++itrC)
{
- if (*itr != a_Client)
+ if (*itrC != a_Client)
{
continue;
}
- m_LoadedByClient.erase(itr);
+ m_LoadedByClient.erase(itrC);
if (!a_Client->IsDestroyed())
{
- for (cEntityList::iterator itr = m_Entities.begin(); itr != m_Entities.end(); ++itr)
+ for (cEntityList::iterator itrE = m_Entities.begin(); itrE != m_Entities.end(); ++itrE)
{
/*
// DEBUG:
@@ -1889,7 +1889,7 @@ void cChunk::RemoveClient(cClientHandle * a_Client)
(*itr)->GetUniqueID(), a_Client->GetUsername().c_str()
);
*/
- a_Client->SendDestroyEntity(*(*itr));
+ a_Client->SendDestroyEntity(*(*itrE));
}
}
return;