Revert "Project modernization (#630)"
This code was not tested and breaks in Release builds, reverting to restore
functionality of the nightly. All in-game menus do not work and generating
a world crashes.
This reverts commit a9be52c41a.
This commit is contained in:
@@ -14,11 +14,11 @@ ZombieRenderer::ZombieRenderer() : HumanoidMobRenderer(new ZombieModel(), .5f, 1
|
||||
defaultModel = humanoidModel;
|
||||
villagerModel = new VillagerZombieModel();
|
||||
|
||||
defaultArmorParts1 = nullptr;
|
||||
defaultArmorParts2 = nullptr;
|
||||
defaultArmorParts1 = NULL;
|
||||
defaultArmorParts2 = NULL;
|
||||
|
||||
villagerArmorParts1 = nullptr;
|
||||
villagerArmorParts2 = nullptr;
|
||||
villagerArmorParts1 = NULL;
|
||||
villagerArmorParts2 = NULL;
|
||||
|
||||
createArmorParts();
|
||||
}
|
||||
@@ -98,7 +98,7 @@ void ZombieRenderer::swapArmor(shared_ptr<Zombie> mob)
|
||||
armorParts2 = defaultArmorParts2;
|
||||
}
|
||||
|
||||
humanoidModel = static_cast<HumanoidModel *>(model);
|
||||
humanoidModel = (HumanoidModel *) model;
|
||||
}
|
||||
|
||||
void ZombieRenderer::setupRotations(shared_ptr<LivingEntity> _mob, float bob, float bodyRot, float a)
|
||||
@@ -106,7 +106,7 @@ void ZombieRenderer::setupRotations(shared_ptr<LivingEntity> _mob, float bob, fl
|
||||
shared_ptr<Zombie> mob = dynamic_pointer_cast<Zombie>(_mob);
|
||||
if (mob->isConverting())
|
||||
{
|
||||
bodyRot += static_cast<float>(cos(mob->tickCount * 3.25) * PI * .25f);
|
||||
bodyRot += (float) (cos(mob->tickCount * 3.25) * PI * .25f);
|
||||
}
|
||||
HumanoidMobRenderer::setupRotations(mob, bob, bodyRot, a);
|
||||
}
|
||||
Reference in New Issue
Block a user