diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-02-02 22:48:21 +0100 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-02-02 22:48:21 +0100 |
| commit | 0f67f80c6e60b2696bf94ee91330cdc0cefde3fa (patch) | |
| tree | ce3d4d45a1a0fe077fe6b5145c4926188b213352 | |
| parent | Revert "Added LOGREPLACELINE for line replacement" (diff) | |
| download | cuberite-0f67f80c6e60b2696bf94ee91330cdc0cefde3fa.tar cuberite-0f67f80c6e60b2696bf94ee91330cdc0cefde3fa.tar.gz cuberite-0f67f80c6e60b2696bf94ee91330cdc0cefde3fa.tar.bz2 cuberite-0f67f80c6e60b2696bf94ee91330cdc0cefde3fa.tar.lz cuberite-0f67f80c6e60b2696bf94ee91330cdc0cefde3fa.tar.xz cuberite-0f67f80c6e60b2696bf94ee91330cdc0cefde3fa.tar.zst cuberite-0f67f80c6e60b2696bf94ee91330cdc0cefde3fa.zip | |
| -rw-r--r-- | src/Defines.h | 20 | ||||
| -rw-r--r-- | src/World.cpp | 2 |
2 files changed, 12 insertions, 10 deletions
diff --git a/src/Defines.h b/src/Defines.h index b3dbcc93e..5b868b2e5 100644 --- a/src/Defines.h +++ b/src/Defines.h @@ -254,16 +254,18 @@ inline bool IsValidItem(int a_ItemType) -inline bool IsBlockWater(BLOCKTYPE a_BlockType, bool a_IncludeFrozenWater = false) +inline bool IsBlockWater(BLOCKTYPE a_BlockType) { - if (a_IncludeFrozenWater) - { - return ((a_BlockType == E_BLOCK_WATER) || (a_BlockType == E_BLOCK_STATIONARY_WATER) || (a_BlockType == E_BLOCK_ICE)); - } - else - { - return ((a_BlockType == E_BLOCK_WATER) || (a_BlockType == E_BLOCK_STATIONARY_WATER)); - } + 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)); } diff --git a/src/World.cpp b/src/World.cpp index f598874ea..d8850e78a 100644 --- a/src/World.cpp +++ b/src/World.cpp @@ -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 { |