summaryrefslogtreecommitdiffstats
path: root/src/World.cpp
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2014-02-09 01:04:42 +0100
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2014-02-09 01:04:42 +0100
commitf86f066615f4e4807941f863f6e749dc12ac01be (patch)
treea792dc877470a98030569204b3d32575da404d6d /src/World.cpp
parentFixed a boat ASSERT (diff)
parentFixed a gcc warning in ManualBindings. (diff)
downloadcuberite-f86f066615f4e4807941f863f6e749dc12ac01be.tar
cuberite-f86f066615f4e4807941f863f6e749dc12ac01be.tar.gz
cuberite-f86f066615f4e4807941f863f6e749dc12ac01be.tar.bz2
cuberite-f86f066615f4e4807941f863f6e749dc12ac01be.tar.lz
cuberite-f86f066615f4e4807941f863f6e749dc12ac01be.tar.xz
cuberite-f86f066615f4e4807941f863f6e749dc12ac01be.tar.zst
cuberite-f86f066615f4e4807941f863f6e749dc12ac01be.zip
Diffstat (limited to 'src/World.cpp')
-rw-r--r--src/World.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/World.cpp b/src/World.cpp
index ab77fa545..04dda0d65 100644
--- a/src/World.cpp
+++ b/src/World.cpp
@@ -1225,7 +1225,7 @@ void cWorld::GrowTreeByBiome(int a_X, int a_Y, int a_Z)
{
cNoise Noise(m_Generator.GetSeed());
sSetBlockVector Logs, Other;
- GetTreeImageByBiome(a_X, a_Y, a_Z, Noise, (int)(m_WorldAge & 0xffffffff), (EMCSBiome)GetBiomeAt(a_X, a_Z), Logs, Other);
+ GetTreeImageByBiome(a_X, a_Y, a_Z, Noise, (int)(m_WorldAge & 0xffffffff), GetBiomeAt(a_X, a_Z), Logs, Other);
Other.insert(Other.begin(), Logs.begin(), Logs.end());
Logs.clear();
GrowTreeImage(Other);
@@ -1478,7 +1478,7 @@ void cWorld::GrowSugarcane(int a_BlockX, int a_BlockY, int a_BlockZ, int a_NumBl
-int cWorld::GetBiomeAt (int a_BlockX, int a_BlockZ)
+EMCSBiome cWorld::GetBiomeAt (int a_BlockX, int a_BlockZ)
{
return m_ChunkMap->GetBiomeAt(a_BlockX, a_BlockZ);
}
@@ -2342,7 +2342,7 @@ bool cWorld::FindAndDoWithPlayer(const AString & a_PlayerNameHint, cPlayerListCa
// TODO: This interface is dangerous!
-cPlayer * cWorld::FindClosestPlayer(const Vector3f & a_Pos, float a_SightLimit, bool a_CheckLineOfSight)
+cPlayer * cWorld::FindClosestPlayer(const Vector3d & a_Pos, float a_SightLimit, bool a_CheckLineOfSight)
{
cTracer LineOfSight(this);