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

Fixed a clang warning, improved comments.

Browse Source
This commit is contained in:
Mattes D 2015-03-19 12:46:37 +01:00
parent 9eb9541060
commit f3046417ec
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/World.cpp
View File

@ -714,6 +714,7 @@ void cWorld::GenerateRandomSpawn(void)
bool cWorld::CheckPlayerSpawnPoint(int a_PosX, int a_PosY, int a_PosZ) bool cWorld::CheckPlayerSpawnPoint(int a_PosX, int a_PosY, int a_PosZ)
{ {
// Check that spawnblock and surrounding blocks are neither solid nor water / lava
static const struct static const struct
{ {
int x, z; int x, z;
@ -725,26 +726,22 @@ bool cWorld::CheckPlayerSpawnPoint(int a_PosX, int a_PosY, int a_PosZ)
{ 0, -1 }, { 0, -1 },
{ 0, 1 }, { 0, 1 },
}; };
// Checking that spawnblock and surrounding blocks are air and not water/lava
for (size_t i = 0; i < ARRAYCOUNT(Coords); i++) for (size_t i = 0; i < ARRAYCOUNT(Coords); i++)
{ {
BLOCKTYPE BlockType = GetBlock(a_PosX + Coords[i].x, a_PosY, a_PosZ + Coords[i].x); BLOCKTYPE BlockType = GetBlock(a_PosX + Coords[i].x, a_PosY, a_PosZ + Coords[i].x);
if (cBlockInfo::IsSolid(BlockType) || IsBlockLiquid(BlockType)) if (cBlockInfo::IsSolid(BlockType) || IsBlockLiquid(BlockType))
{ {
return false; return false;
} }
} // for i - Coords[] } // for i - Coords[]
// Check if block below is solid // Check that the block below is solid:
BLOCKTYPE BlockType = GetBlock(a_PosX, a_PosY - 1, a_PosZ); if (!cBlockInfo::IsSolid(GetBlock(a_PosX, a_PosY - 1, a_PosZ)))
if (!cBlockInfo::IsSolid(BlockType))
{ {
return false; return false;
} }
// Checking that all the blocks above the spawnpoint is air. // Check that all the blocks above the spawnpoint are not solid:
for (int i = a_PosY; i < cChunkDef::Height; i++) for (int i = a_PosY; i < cChunkDef::Height; i++)
{ {
BLOCKTYPE BlockType = GetBlock(a_PosX, i, a_PosZ); BLOCKTYPE BlockType = GetBlock(a_PosX, i, a_PosZ);