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

Added IsBlockWaterOrIce()

Browse Source
This commit is contained in:
Tiger Wang 2014-02-02 21:48:21 +00:00
parent d9a9052de7
commit 0f67f80c6e
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Defines.h
View File

@ -254,16 +254,18 @@ inline bool IsValidItem(int a_ItemType)
inline bool IsBlockWater(BLOCKTYPE a_BlockType, bool a_IncludeFrozenWater = false)
{
if (a_IncludeFrozenWater)
{
return ((a_BlockType == E_BLOCK_WATER) || (a_BlockType == E_BLOCK_STATIONARY_WATER) || (a_BlockType == E_BLOCK_ICE));
}
else
inline bool IsBlockWater(BLOCKTYPE a_BlockType)
{
return ((a_BlockType == E_BLOCK_WATER) || (a_BlockType == E_BLOCK_STATIONARY_WATER));
}
inline bool IsBlockWaterOrIce(BLOCKTYPE a_BlockType)
{
return (IsBlockWater(a_BlockType) || (a_BlockType == E_BLOCK_ICE));
}

2
src/World.cpp
View File

@ -633,7 +633,7 @@ void cWorld::GenerateRandomSpawn(void)
{
LOGD("Generating random spawnpoint...");
while (IsBlockWater(GetBlock((int)m_SpawnX, GetHeight((int)m_SpawnX, (int)m_SpawnZ), (int)m_SpawnZ), true))
while (IsBlockWaterOrIce(GetBlock((int)m_SpawnX, GetHeight((int)m_SpawnX, (int)m_SpawnZ), (int)m_SpawnZ)))
{
if ((GetTickRandomNumber(4) % 2) == 0) // Randomise whether to increment X or Z coords
{