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

replacing asserts by ASSERTs

Browse Source
This commit is contained in:
mgueydan 2013-09-08 12:20:19 +02:00
parent e6e85168bc
commit 5846be9400
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/Chunk.cpp
View File

@ -471,7 +471,7 @@ void cChunk::CollectMobCensus(cMobCensus& toFill)
void cChunk::getThreeRandomNumber(int& a_X, int& a_Y, int& a_Z,int a_MaxX, int a_MaxY, int a_MaxZ) void cChunk::getThreeRandomNumber(int& a_X, int& a_Y, int& a_Z,int a_MaxX, int a_MaxY, int a_MaxZ)
{ {
assert(a_MaxX * a_MaxY * a_MaxZ * 8 < 0x00ffffff); ASSERT(a_MaxX * a_MaxY * a_MaxZ * 8 < 0x00ffffff);
int Random = m_World->GetTickRandomNumber(0x00ffffff); int Random = m_World->GetTickRandomNumber(0x00ffffff);
a_X = Random % (a_MaxX * 2); a_X = Random % (a_MaxX * 2);
a_Y = (Random / (a_MaxX * 2)) % (a_MaxY * 2); a_Y = (Random / (a_MaxX * 2)) % (a_MaxY * 2);
@ -523,8 +523,8 @@ void cChunk::SpawnMobs(cMobSpawner& a_MobSpawner)
Try_Y += Center_Y; Try_Y += Center_Y;
Try_Z += Center_Z; Try_Z += Center_Z;
assert(Try_Y > 0); ASSERT(Try_Y > 0);
assert(Try_Y < cChunkDef::Height-1); ASSERT(Try_Y < cChunkDef::Height-1);
BLOCKTYPE BlockType; BLOCKTYPE BlockType;
NIBBLETYPE BlockMeta; NIBBLETYPE BlockMeta;

2
source/MobProximityCounter.cpp
View File

@ -16,7 +16,7 @@ void cMobProximityCounter::CollectMob(cEntity& a_Monster, cChunk& a_Chunk, doubl
std::pair<tMonsterToDistance::iterator,bool> result = m_MonsterToDistance.insert(tMonsterToDistance::value_type(&a_Monster,newDistanceAndChunck)); std::pair<tMonsterToDistance::iterator,bool> result = m_MonsterToDistance.insert(tMonsterToDistance::value_type(&a_Monster,newDistanceAndChunck));
if (!result.second) if (!result.second)
{ {
ASSERT("A collected Monster was not found inside distance map using find(), but insert() said there already is a key for it"); ASSERT(!"A collected Monster was not found inside distance map using find(), but insert() said there already is a key for it");
} }
} }
else else

8
source/MobTypesManager.cpp
View File

@ -102,7 +102,11 @@ cMonster* cMobTypesManager::NewMonsterFromType(cMonster::eType a_MobType, int a_
{ {
a_Size = m_Random().NextInt(2,a_MobType)+1; a_Size = m_Random().NextInt(2,a_MobType)+1;
} }
assert(a_Size > 0 && a_Size < 4); if (a_Size <= 0 || a_Size >= 4)
{
ASSERT(!"Random for size was supposed to pick in [1..3] and picked outside");
a_Size = 1;
}
break; break;
default : break; default : break;
} }
@ -135,7 +139,7 @@ cMonster* cMobTypesManager::NewMonsterFromType(cMonster::eType a_MobType, int a_
case cMonster::mtZombiePigman: toReturn = new cZombiepigman(); break; case cMonster::mtZombiePigman: toReturn = new cZombiepigman(); break;
default: default:
{ {
assert(false); ASSERT(!"Unhandled Mob type");
} }
} }
return toReturn; return toReturn;