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

Fixed MCServer not compiling with C++03 compilers

Browse Source
This commit is contained in:
STRWarrior
2014-02-24 14:43:46 +01:00
parent 145b3492e7
commit 9440b61c8c
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Map.cpp
View File

@@ -51,8 +51,8 @@ void cMapDecorator::Update(void)
int InsideWidth = (m_Map->GetWidth() / 2) - 1;
int InsideHeight = (m_Map->GetHeight() / 2) - 1;
int PixelX = (m_Player->GetPosX() - m_Map->GetCenterX()) / PixelWidth;
int PixelZ = (m_Player->GetPosZ() - m_Map->GetCenterZ()) / PixelWidth;
int PixelX = (int) (m_Player->GetPosX() - m_Map->GetCenterX()) / PixelWidth;
int PixelZ = (int) (m_Player->GetPosZ() - m_Map->GetCenterZ()) / PixelWidth;
// Center of pixel
m_PixelX = (2 * PixelX) + 1;
@@ -69,11 +69,11 @@ void cMapDecorator::Update(void)
Int64 WorldAge = m_Player->GetWorld()->GetWorldAge();
// TODO 2014-02-19 xdot: Refine
m_Rot = Random.NextInt(16, WorldAge);
m_Rot = Random.NextInt(16, (int) WorldAge);
}
else
{
m_Rot = (Yaw * 16) / 360;
m_Rot = (int) (Yaw * 16) / 360;
}
m_Type = E_TYPE_PLAYER;
@@ -183,8 +183,8 @@ void cMap::UpdateRadius(cPlayer & a_Player, unsigned int a_Radius)
{
unsigned int PixelWidth = GetPixelWidth();
int PixelX = (a_Player.GetPosX() - m_CenterX) / PixelWidth + (m_Width / 2);
int PixelZ = (a_Player.GetPosZ() - m_CenterZ) / PixelWidth + (m_Height / 2);
int PixelX = (int) (a_Player.GetPosX() - m_CenterX) / PixelWidth + (m_Width / 2);
int PixelZ = (int) (a_Player.GetPosZ() - m_CenterZ) / PixelWidth + (m_Height / 2);
UpdateRadius(PixelX, PixelZ, a_Radius);
}
@@ -620,7 +620,7 @@ unsigned int cMap::GetNumDecorators(void) const
unsigned int cMap::GetPixelWidth(void) const
{
return pow(2, m_Scale);
return (int) pow(2.0, (double) m_Scale);
}