Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "dynamic_pointer_cast -> std::dynamic_pointer_cast"

Browse Source 
This reverts commit 07ad68bc15.
This commit is contained in:
void_17
2026-03-02 17:36:56 +07:00
parent 07ad68bc15
commit 7ae0c13854
207 changed files with 623 additions and 623 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Minecraft.World/Animal.cpp
View File

@@ -64,7 +64,7 @@ void Animal::aiStep()
void Animal::checkHurtTarget(std::shared_ptr<Entity> target, float d)
{
if (std::dynamic_pointer_cast<Player>(target) != NULL)
if (dynamic_pointer_cast<Player>(target) != NULL)
{
if (d < 3)
{
@@ -75,7 +75,7 @@ void Animal::checkHurtTarget(std::shared_ptr<Entity> target, float d)
holdGround = true;
}
std::shared_ptr<Player> p = std::dynamic_pointer_cast<Player>(target);
std::shared_ptr<Player> p = dynamic_pointer_cast<Player>(target);
if (p->getSelectedItem() != NULL && this->isFood(p->getSelectedItem()))
{
}
@@ -85,9 +85,9 @@ void Animal::checkHurtTarget(std::shared_ptr<Entity> target, float d)
}
}
else if (std::dynamic_pointer_cast<Animal>(target) != NULL)
else if (dynamic_pointer_cast<Animal>(target) != NULL)
{
std::shared_ptr<Animal> a = std::dynamic_pointer_cast<Animal>(target);
std::shared_ptr<Animal> a = dynamic_pointer_cast<Animal>(target);
if (getAge() > 0 && a->getAge() < 0)
{
if (d < 2.5)
@@ -172,15 +172,15 @@ bool Animal::hurt(DamageSource *dmgSource, int dmg)
{
std::shared_ptr<Entity> source = dmgSource->getDirectEntity();
if (std::dynamic_pointer_cast<Player>(source) != NULL && !std::dynamic_pointer_cast<Player>(source)->isAllowedToAttackAnimals() )
if (dynamic_pointer_cast<Player>(source) != NULL && !dynamic_pointer_cast<Player>(source)->isAllowedToAttackAnimals() )
{
return false;
}
if (source != NULL && source->GetType() == eTYPE_ARROW)
{
std::shared_ptr<Arrow> arrow = std::dynamic_pointer_cast<Arrow>(source);
if (std::dynamic_pointer_cast<Player>(arrow->owner) != NULL && ! std::dynamic_pointer_cast<Player>(arrow->owner)->isAllowedToAttackAnimals() )
std::shared_ptr<Arrow> arrow = dynamic_pointer_cast<Arrow>(source);
if (dynamic_pointer_cast<Player>(arrow->owner) != NULL && ! dynamic_pointer_cast<Player>(arrow->owner)->isAllowedToAttackAnimals() )
{
return false;
}
@@ -218,7 +218,7 @@ std::shared_ptr<Entity> Animal::findAttackTarget()
//for (int i = 0; i < others->size(); i++)
for(AUTO_VAR(it, others->begin()); it != others->end(); ++it)
{
std::shared_ptr<Animal> p = std::dynamic_pointer_cast<Animal>(*it);
std::shared_ptr<Animal> p = dynamic_pointer_cast<Animal>(*it);
if (p != shared_from_this() && p->getInLoveValue() > 0)
{
delete others;
@@ -237,7 +237,7 @@ std::shared_ptr<Entity> Animal::findAttackTarget()
{
setDespawnProtected();
std::shared_ptr<Player> p = std::dynamic_pointer_cast<Player>(*it);
std::shared_ptr<Player> p = dynamic_pointer_cast<Player>(*it);
if (p->getSelectedItem() != NULL && this->isFood(p->getSelectedItem()))
{
delete players;
@@ -252,7 +252,7 @@ std::shared_ptr<Entity> Animal::findAttackTarget()
//for (int i = 0; i < others.size(); i++)
for(AUTO_VAR(it, others->begin()); it != others->end(); ++it)
{
std::shared_ptr<Animal> p = std::dynamic_pointer_cast<Animal>(*it);
std::shared_ptr<Animal> p = dynamic_pointer_cast<Animal>(*it);
if (p != shared_from_this() && p->getAge() < 0)
{
delete others;