diff options
| author | mgueydan <gueydan.mathieuÃ@gmail.com> | 2013-09-08 11:48:48 +0200 |
|---|---|---|
| committer | mgueydan <gueydan.mathieuÃ@gmail.com> | 2013-09-08 11:49:33 +0200 |
| commit | 668b6edaa7390f87b0b7e7e28ddb49c9d3f66d2a (patch) | |
| tree | 5c2250ad2e3a349afcad16272be6f6f75ee4cb05 /source | |
| parent | incrementing .gitignore : adding emacs stuff and world (diff) | |
| download | cuberite-668b6edaa7390f87b0b7e7e28ddb49c9d3f66d2a.tar cuberite-668b6edaa7390f87b0b7e7e28ddb49c9d3f66d2a.tar.gz cuberite-668b6edaa7390f87b0b7e7e28ddb49c9d3f66d2a.tar.bz2 cuberite-668b6edaa7390f87b0b7e7e28ddb49c9d3f66d2a.tar.lz cuberite-668b6edaa7390f87b0b7e7e28ddb49c9d3f66d2a.tar.xz cuberite-668b6edaa7390f87b0b7e7e28ddb49c9d3f66d2a.tar.zst cuberite-668b6edaa7390f87b0b7e7e28ddb49c9d3f66d2a.zip | |
Diffstat (limited to 'source')
| -rw-r--r-- | source/Chunk.cpp | 4 | ||||
| -rw-r--r-- | source/Chunk.h | 2 | ||||
| -rw-r--r-- | source/MobSpawner.cpp | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/source/Chunk.cpp b/source/Chunk.cpp index 8c4c77250..a77f10609 100644 --- a/source/Chunk.cpp +++ b/source/Chunk.cpp @@ -485,7 +485,7 @@ void cChunk::getThreeRandomNumber(int& a_X, int& a_Y, int& a_Z,int a_MaxX, int a -void cChunk::getRandomBlock(int& a_X, int& a_Y, int& a_Z) +void cChunk::getRandomBlockCoords(int& a_X, int& a_Y, int& a_Z) { // MG TODO : check if this kind of optimization (only one random call) is still needed // MG TODO : if so propagate it @@ -501,7 +501,7 @@ void cChunk::getRandomBlock(int& a_X, int& a_Y, int& a_Z) void cChunk::SpawnMobs(cMobSpawner& a_MobSpawner) { int Center_X,Center_Y,Center_Z; - getRandomBlock(Center_X,Center_Y,Center_Z); + getRandomBlockCoords(Center_X,Center_Y,Center_Z); BLOCKTYPE PackCenterBlock = GetBlock(Center_X, Center_Y, Center_Z); if (a_MobSpawner.CheckPackCenter(PackCenterBlock)) diff --git a/source/Chunk.h b/source/Chunk.h index 69ecbfec4..aca180d16 100644 --- a/source/Chunk.h +++ b/source/Chunk.h @@ -394,7 +394,7 @@ private: // pick up a random block of this chunk - void getRandomBlock(int& a_X, int& a_Y, int& a_Z); + void getRandomBlockCoords(int& a_X, int& a_Y, int& a_Z); void getThreeRandomNumber(int& a_X, int& a_Y, int& a_Z,int a_MaxX, int a_MaxY, int a_MaxZ); void RemoveBlockEntity(cBlockEntity * a_BlockEntity); diff --git a/source/MobSpawner.cpp b/source/MobSpawner.cpp index 38234ae67..9bff87533 100644 --- a/source/MobSpawner.cpp +++ b/source/MobSpawner.cpp @@ -6,8 +6,6 @@ #include "Mobs/Monster.h" #include "Mobs/IncludeAllMonsters.h" -#include <sstream> - cMobSpawner::tMobTypes& cMobSpawner::m_MobTypes() { static tMobTypes* value = new tMobTypes(initMobTypesBeforeCx11()); @@ -179,7 +177,6 @@ bool cMobSpawner::CanSpawnHere(cMonster::eType a_MobType, BLOCKTYPE a_BlockType, { if (a_MobType == cMonster::mtChicken || a_MobType == cMonster::mtPig || a_MobType == cMonster::mtCow || a_MobType == cMonster::mtSheep) { - LOGD(oss.str().c_str()); toReturn = ( a_BlockType_below == E_BLOCK_GRASS /*&& // MG TODO a_LightLevel >= 9 */ |