summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTycho <work.tycho+git@gmail.com>2014-04-27 15:46:13 +0200
committerTycho <work.tycho+git@gmail.com>2014-04-27 15:46:13 +0200
commite3bdc81ca04fbad284eb0c3b53678f0fb357eb64 (patch)
tree459c54a8783c44cf386a78561b33da4663c376cc
parentFixed bad merge (diff)
downloadcuberite-e3bdc81ca04fbad284eb0c3b53678f0fb357eb64.tar
cuberite-e3bdc81ca04fbad284eb0c3b53678f0fb357eb64.tar.gz
cuberite-e3bdc81ca04fbad284eb0c3b53678f0fb357eb64.tar.bz2
cuberite-e3bdc81ca04fbad284eb0c3b53678f0fb357eb64.tar.lz
cuberite-e3bdc81ca04fbad284eb0c3b53678f0fb357eb64.tar.xz
cuberite-e3bdc81ca04fbad284eb0c3b53678f0fb357eb64.tar.zst
cuberite-e3bdc81ca04fbad284eb0c3b53678f0fb357eb64.zip
Diffstat (limited to '')
-rw-r--r--src/MobProximityCounter.cpp5
-rw-r--r--src/MobProximityCounter.h4
2 files changed, 4 insertions, 5 deletions
diff --git a/src/MobProximityCounter.cpp b/src/MobProximityCounter.cpp
index c7e91e18b..ce20bf56b 100644
--- a/src/MobProximityCounter.cpp
+++ b/src/MobProximityCounter.cpp
@@ -24,8 +24,7 @@ void cMobProximityCounter::CollectMob(cEntity& a_Monster, cChunk& a_Chunk, doubl
if (a_Distance < it->second.m_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)
{
- 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)));
}
}
diff --git a/src/MobProximityCounter.h b/src/MobProximityCounter.h
index 8a67139aa..79429eb60 100644
--- a/src/MobProximityCounter.h
+++ b/src/MobProximityCounter.h
@@ -16,9 +16,9 @@ protected :
// structs used for later maps (see m_MonsterToDistance and m_DistanceToMonster)
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;
- cChunk& m_Chunk;
+ cChunk* m_Chunk;
};
struct sMonsterAndChunk
{