1
0
Fork 0

Merge branch 'master' into PreventNewWarnings

This commit is contained in:
tycho 2015-05-19 19:40:39 +01:00
commit 813c95d4b0
2 changed files with 2 additions and 1 deletions

@ -1 +1 @@
Subproject commit ea0ab964d568630fd4f2b52954186f2851a769e1
Subproject commit 5171b43807ff699a6b239ad4969520730b3748a2

View File

@ -1274,6 +1274,7 @@ bool cFinishGenPassiveMobs::TrySpawnAnimals(cChunkDesc & a_ChunkDesc, int a_RelX
double AnimalZ = static_cast<double>(a_ChunkDesc.GetChunkZ() * cChunkDef::Width + a_RelZ + 0.5);
cMonster * NewMob = cMonster::NewMonsterFromType(AnimalToSpawn);
NewMob->SetHealth(NewMob->GetMaxHealth());
NewMob->SetPosition(AnimalX, AnimalY, AnimalZ);
a_ChunkDesc.GetEntities().push_back(NewMob);
LOGD("Spawning %s #%i at {%.02f, %.02f, %.02f}", NewMob->GetClass(), NewMob->GetUniqueID(), AnimalX, AnimalY, AnimalZ);