From 119bff351450ea16ffda550b6e0f67379b29f708 Mon Sep 17 00:00:00 2001 From: void_17 Date: Mon, 2 Mar 2026 17:37:16 +0700 Subject: Revert "shared_ptr -> std::shared_ptr" This reverts commit 7074f35e4ba831e358117842b99ee35b87f85ae5. --- Minecraft.World/PigZombie.cpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'Minecraft.World/PigZombie.cpp') diff --git a/Minecraft.World/PigZombie.cpp b/Minecraft.World/PigZombie.cpp index 35da6eb9..cc060484 100644 --- a/Minecraft.World/PigZombie.cpp +++ b/Minecraft.World/PigZombie.cpp @@ -14,11 +14,11 @@ -std::shared_ptr PigZombie::sword; +shared_ptr PigZombie::sword; void PigZombie::staticCtor() { - PigZombie::sword = std::shared_ptr( new ItemInstance(Item::sword_gold, 1) ); + PigZombie::sword = shared_ptr( new ItemInstance(Item::sword_gold, 1) ); } void PigZombie::_init() @@ -51,7 +51,7 @@ bool PigZombie::useNewAi() return false; } -int PigZombie::getTexture() +int PigZombie::getTexture() { return textureIdx; } @@ -69,7 +69,7 @@ void PigZombie::tick() Zombie::tick(); } -bool PigZombie::canSpawn() +bool PigZombie::canSpawn() { return level->difficulty > Difficulty::PEACEFUL && level->isUnobstructed(bb) && level->getCubes(shared_from_this(), bb)->empty() && !level->containsAnyLiquid(bb); } @@ -86,13 +86,13 @@ void PigZombie::readAdditionalSaveData(CompoundTag *tag) angerTime = tag->getShort(L"Anger"); } -std::shared_ptr PigZombie::findAttackTarget() +shared_ptr PigZombie::findAttackTarget() { #ifndef _FINAL_BUILD #ifdef _DEBUG_MENUS_ENABLED if(app.GetMobsDontAttackEnabled()) { - return std::shared_ptr(); + return shared_ptr(); } #endif #endif @@ -103,17 +103,17 @@ std::shared_ptr PigZombie::findAttackTarget() bool PigZombie::hurt(DamageSource *source, int dmg) { - std::shared_ptr sourceEntity = source->getEntity(); + shared_ptr sourceEntity = source->getEntity(); if (dynamic_pointer_cast(sourceEntity) != NULL) { - vector > *nearby = level->getEntities( shared_from_this(), bb->grow(32, 32, 32)); + vector > *nearby = level->getEntities( shared_from_this(), bb->grow(32, 32, 32)); AUTO_VAR(itEnd, nearby->end()); for (AUTO_VAR(it, nearby->begin()); it != itEnd; it++) { - std::shared_ptr e = *it; //nearby->at(i); + shared_ptr e = *it; //nearby->at(i); if (dynamic_pointer_cast(e) != NULL) { - std::shared_ptr pigZombie = dynamic_pointer_cast(e); + shared_ptr pigZombie = dynamic_pointer_cast(e); pigZombie->alert(sourceEntity); } } @@ -122,7 +122,7 @@ bool PigZombie::hurt(DamageSource *source, int dmg) return Zombie::hurt(source, dmg); } -void PigZombie::alert(std::shared_ptr target) +void PigZombie::alert(shared_ptr target) { this->attackTarget = target; angerTime = 20 * 20 + random->nextInt(20 * 20); @@ -162,7 +162,7 @@ void PigZombie::dropRareDeathLoot(int rareLootLevel) { if (rareLootLevel > 0) { - std::shared_ptr sword = std::shared_ptr( new ItemInstance(Item::sword_gold) ); + shared_ptr sword = shared_ptr( new ItemInstance(Item::sword_gold) ); EnchantmentHelper::enchantItem(random, sword, 5); spawnAtLocation(sword, 0); } @@ -195,8 +195,8 @@ void PigZombie::finalizeMobSpawn() setVillager(false); } -std::shared_ptr PigZombie::getCarriedItem() +shared_ptr PigZombie::getCarriedItem() { - // TODO 4J - could be of const std::shared_ptr type. - return (std::shared_ptr ) sword; + // TODO 4J - could be of const shared_ptr type. + return (shared_ptr ) sword; } -- cgit v1.2.3