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

renaming the cChunk::getRandomBlock method + removing a buggy working log

Browse Source
This commit is contained in:
mgueydan 2013-09-08 11:48:48 +02:00
parent 1d987d4e90
commit 668b6edaa7
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/Chunk.cpp
View File

@ -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 : check if this kind of optimization (only one random call) is still needed
// MG TODO : if so propagate it // 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) void cChunk::SpawnMobs(cMobSpawner& a_MobSpawner)
{ {
int Center_X,Center_Y,Center_Z; 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); BLOCKTYPE PackCenterBlock = GetBlock(Center_X, Center_Y, Center_Z);
if (a_MobSpawner.CheckPackCenter(PackCenterBlock)) if (a_MobSpawner.CheckPackCenter(PackCenterBlock))

2
source/Chunk.h
View File

@ -394,7 +394,7 @@ private:
// pick up a random block of this chunk // 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 getThreeRandomNumber(int& a_X, int& a_Y, int& a_Z,int a_MaxX, int a_MaxY, int a_MaxZ);
void RemoveBlockEntity(cBlockEntity * a_BlockEntity); void RemoveBlockEntity(cBlockEntity * a_BlockEntity);

3
source/MobSpawner.cpp
View File

@ -6,8 +6,6 @@
#include "Mobs/Monster.h" #include "Mobs/Monster.h"
#include "Mobs/IncludeAllMonsters.h" #include "Mobs/IncludeAllMonsters.h"
#include <sstream>
cMobSpawner::tMobTypes& cMobSpawner::m_MobTypes() cMobSpawner::tMobTypes& cMobSpawner::m_MobTypes()
{ {
static tMobTypes* value = new tMobTypes(initMobTypesBeforeCx11()); 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) if (a_MobType == cMonster::mtChicken || a_MobType == cMonster::mtPig || a_MobType == cMonster::mtCow || a_MobType == cMonster::mtSheep)
{ {
LOGD(oss.str().c_str());
toReturn = ( toReturn = (
a_BlockType_below == E_BLOCK_GRASS /*&& // MG TODO a_BlockType_below == E_BLOCK_GRASS /*&& // MG TODO
a_LightLevel >= 9 */ a_LightLevel >= 9 */