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

indentation, repeatable random, small corrections

Browse Source
This commit is contained in:
p-mcgowan 2014-12-02 11:21:51 -08:00
parent 978c9967ad
commit 585662e63f
1 changed files with 87 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/Generating/FinishGen.cpp
View File

@ -986,7 +986,7 @@ cFinishGenPassiveMobs::cFinishGenPassiveMobs(int a_Seed, cIniFile & a_IniFile, e
void cFinishGenPassiveMobs::GenFinish(cChunkDesc & a_ChunkDesc)
{
int ChanceRnd = m_Random.NextInt(100);
int ChanceRnd = (m_Noise.IntNoise2DInt(chunkX, chunkZ) / 7) % 100;
if (ChanceRnd > m_AnimalProbability)
{
return;
@ -1002,17 +1002,16 @@ void cFinishGenPassiveMobs::GenFinish(cChunkDesc & a_ChunkDesc)
// Try spawning a pack center 10 times, should get roughly the same probability
for (int Tries = 0; Tries < 10; Tries++)
{
int PackCenterX = m_Random.NextInt(cChunkDef::Width - 1);
int PackCenterZ = m_Random.NextInt(cChunkDef::Width - 1);
int PackCenterX = (m_Noise.IntNoise2DInt(chunkX, chunkZ) / 7) % cChunkDef::Width;
int PackCenterZ = (m_Noise.IntNoise2DInt(chunkX, chunkZ) / 7) % cChunkDef::Width;
if (TrySpawnAnimals(a_ChunkDesc, PackCenterX, a_ChunkDesc.GetHeight(PackCenterX, PackCenterZ), PackCenterZ, RandomMob))
{
for (int i = 0; i < 5; i++)
{
int OffsetX = m_Random.NextInt(cChunkDef::Width - 1);
int OffsetZ = m_Random.NextInt(cChunkDef::Width - 1);
int OffsetX = (m_Noise.IntNoise2DInt(chunkX, chunkZ) / 7) % cChunkDef::Width;
int OffsetZ = (m_Noise.IntNoise2DInt(chunkX, chunkZ) / 7) % cChunkDef::Width;
TrySpawnAnimals(a_ChunkDesc, OffsetX, a_ChunkDesc.GetHeight(OffsetX, OffsetZ), OffsetZ, RandomMob);
}
return;
} // if pack center spawn successful
@ -1034,8 +1033,7 @@ bool cFinishGenPassiveMobs::TrySpawnAnimals(cChunkDesc & a_ChunkDesc, int a_RelX
{
return false;
}
if (
(AnimalToSpawn != mtSquid) &&
if ((AnimalToSpawn != mtSquid) &&
(BlockAtHead != E_BLOCK_AIR) &&
(BlockAtFeet != E_BLOCK_AIR) &&
(!cBlockInfo::IsTransparent(BlockUnderFeet))
@ -1043,14 +1041,12 @@ bool cFinishGenPassiveMobs::TrySpawnAnimals(cChunkDesc & a_ChunkDesc, int a_RelX
{
return false;
}
if (
(BlockUnderFeet != E_BLOCK_GRASS) &&
(
(AnimalToSpawn == mtSheep) ||
(AnimalToSpawn == mtChicken) ||
(AnimalToSpawn == mtPig)
)
)
if ((BlockUnderFeet != E_BLOCK_GRASS) &&
((AnimalToSpawn == mtSheep) || (AnimalToSpawn == mtChicken) || (AnimalToSpawn == mtPig)))
{
return false;
}
if (AnimalToSpawn == mtMooshroom && BlockUnderFeet != E_BLOCK_MYCELIUM)
{
return false;
}
@ -1078,8 +1074,8 @@ eMonsterType cFinishGenPassiveMobs::GetRandomMob(cChunkDesc & a_ChunkDesc)
std::set<eMonsterType> ListOfSpawnables;
std::set<eMonsterType>::iterator MobIter = ListOfSpawnables.begin();
int x = m_Random.NextInt(cChunkDef::Width - 1);
int z = m_Random.NextInt(cChunkDef::Width - 1);
int x = (m_Noise.IntNoise2DInt(chunkX, chunkZ) / 7) % cChunkDef::Width;
int z = (m_Noise.IntNoise2DInt(chunkX, chunkZ) / 7) % cChunkDef::Width;
// Check biomes first to get a list of animals
switch (a_ChunkDesc.GetBiome(x, z))
@ -1136,9 +1132,8 @@ eMonsterType cFinishGenPassiveMobs::GetRandomMob(cChunkDesc & a_ChunkDesc)
ListOfSpawnables.insert(MobIter, mtSheep);
}
if (ListOfSpawnables.size() == 0)
if (ListOfSpawnables.empty())
{
LOGD("Tried to spawn an animal from an empty list.");
return mtInvalidType;
}