flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Fixed MobProximity Counter to remove chunk copys

Browse Source
This commit is contained in:
Tycho 2014-04-27 06:46:13 -07:00
parent dcb2a590e3
commit e3bdc81ca0
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/MobProximityCounter.cpp
View File

@ -24,8 +24,7 @@ void cMobProximityCounter::CollectMob(cEntity& a_Monster, cChunk& a_Chunk, doubl
if (a_Distance < it->second.m_Distance) if (a_Distance < it->second.m_Distance)
{ {
it->second.m_Distance = a_Distance; it->second.m_Distance = a_Distance;
ASSERT(false); it->second.m_Chunk = &a_Chunk;
//it->second.m_Chunk = a_Chunk;
} }
} }
@ -37,7 +36,7 @@ void cMobProximityCounter::convertMaps()
{ {
for(tMonsterToDistance::const_iterator itr = m_MonsterToDistance.begin(); itr != m_MonsterToDistance.end(); ++itr) for(tMonsterToDistance::const_iterator itr = m_MonsterToDistance.begin(); itr != m_MonsterToDistance.end(); ++itr)
{ {
m_DistanceToMonster.insert(tDistanceToMonster::value_type(itr->second.m_Distance,sMonsterAndChunk(*itr->first,itr->second.m_Chunk))); m_DistanceToMonster.insert(tDistanceToMonster::value_type(itr->second.m_Distance,sMonsterAndChunk(*itr->first,*itr->second.m_Chunk)));
} }
} }

4
src/MobProximityCounter.h
View File

@ -16,9 +16,9 @@ protected :
// structs used for later maps (see m_MonsterToDistance and m_DistanceToMonster) // structs used for later maps (see m_MonsterToDistance and m_DistanceToMonster)
struct sDistanceAndChunk struct sDistanceAndChunk
{ {
sDistanceAndChunk(double a_Distance, cChunk& a_Chunk) : m_Distance(a_Distance), m_Chunk(a_Chunk) {} sDistanceAndChunk(double a_Distance, cChunk& a_Chunk) : m_Distance(a_Distance), m_Chunk(&a_Chunk) {}
double m_Distance; double m_Distance;
cChunk& m_Chunk; cChunk* m_Chunk;
}; };
struct sMonsterAndChunk struct sMonsterAndChunk
{ {