From 07ad68bc156b3ab70401723bb074a29588ad3cb7 Mon Sep 17 00:00:00 2001 From: void_17 Date: Mon, 2 Mar 2026 17:10:34 +0700 Subject: dynamic_pointer_cast -> std::dynamic_pointer_cast --- Minecraft.World/AddGlobalEntityPacket.cpp | 2 +- Minecraft.World/AgableMob.cpp | 2 +- Minecraft.World/Animal.cpp | 20 +++--- Minecraft.World/Arrow.cpp | 16 ++--- Minecraft.World/ArrowAttackGoal.cpp | 4 +- Minecraft.World/AvoidPlayerGoal.cpp | 4 +- Minecraft.World/Blaze.cpp | 2 +- Minecraft.World/Boat.cpp | 8 +-- Minecraft.World/BonusChestFeature.cpp | 2 +- Minecraft.World/BossMobPart.cpp | 2 +- Minecraft.World/BreedGoal.cpp | 2 +- Minecraft.World/BrewingStandMenu.cpp | 8 +-- Minecraft.World/BrewingStandTile.cpp | 6 +- Minecraft.World/BucketItem.cpp | 2 +- Minecraft.World/CarrotOnAStickItem.cpp | 2 +- Minecraft.World/CauldronTile.cpp | 4 +- Minecraft.World/CaveSpider.cpp | 4 +- Minecraft.World/ChestTile.cpp | 16 ++--- Minecraft.World/ChestTileEntity.cpp | 8 +-- Minecraft.World/ClientCommandPacket.cpp | 2 +- Minecraft.World/ContainerMenu.cpp | 2 +- Minecraft.World/ControlledByPlayerGoal.cpp | 4 +- Minecraft.World/Creeper.cpp | 6 +- Minecraft.World/DefendVillageTargetGoal.cpp | 2 +- Minecraft.World/DispenserTile.cpp | 8 +-- Minecraft.World/DragonFireball.cpp | 2 +- Minecraft.World/DyePowderItem.cpp | 4 +- Minecraft.World/EggItem.cpp | 4 +- Minecraft.World/EnderChestTile.cpp | 2 +- Minecraft.World/EnderCrystal.cpp | 4 +- Minecraft.World/EnderDragon.cpp | 18 +++--- Minecraft.World/EnderMan.cpp | 2 +- Minecraft.World/Entity.cpp | 6 +- Minecraft.World/EntityDamageSource.cpp | 4 +- Minecraft.World/Explosion.cpp | 2 +- Minecraft.World/FarmTile.cpp | 2 +- Minecraft.World/Fireball.cpp | 4 +- Minecraft.World/FishingHook.cpp | 6 +- Minecraft.World/FollowParentGoal.cpp | 2 +- Minecraft.World/FurnaceMenu.cpp | 2 +- Minecraft.World/FurnaceTile.cpp | 4 +- Minecraft.World/Ghast.cpp | 4 +- Minecraft.World/HangingEntity.cpp | 8 +-- Minecraft.World/HangingEntityItem.cpp | 4 +- Minecraft.World/HurtByTargetGoal.cpp | 2 +- Minecraft.World/IndirectEntityDamageSource.cpp | 2 +- Minecraft.World/Inventory.cpp | 2 +- Minecraft.World/ItemEntity.cpp | 4 +- Minecraft.World/ItemFrame.cpp | 2 +- Minecraft.World/ItemInstance.cpp | 2 +- Minecraft.World/KillCommand.cpp | 2 +- Minecraft.World/Level.cpp | 22 +++---- Minecraft.World/LevelChunk.cpp | 8 +-- Minecraft.World/LookAtTradingPlayerGoal.cpp | 2 +- Minecraft.World/LookControl.cpp | 2 +- Minecraft.World/MakeLoveGoal.cpp | 2 +- Minecraft.World/MapItem.cpp | 8 +-- Minecraft.World/MapItemSavedData.cpp | 2 +- Minecraft.World/MerchantMenu.cpp | 2 +- Minecraft.World/MerchantResultSlot.cpp | 2 +- Minecraft.World/MineShaftPieces.cpp | 2 +- Minecraft.World/Minecart.cpp | 18 +++--- Minecraft.World/Mob.cpp | 32 +++++----- Minecraft.World/MobEffect.cpp | 4 +- Minecraft.World/MobSpawner.cpp | 14 ++--- Minecraft.World/MobSpawnerTileEntity.cpp | 4 +- Minecraft.World/Monster.cpp | 6 +- Minecraft.World/MonsterPlacerItem.cpp | 4 +- Minecraft.World/MonsterRoomFeature.cpp | 4 +- Minecraft.World/MoveEntityPacket.cpp | 2 +- Minecraft.World/MoveEntityPacketSmall.cpp | 2 +- Minecraft.World/MoveIndoorsGoal.cpp | 2 +- Minecraft.World/MoveThroughVillageGoal.cpp | 2 +- Minecraft.World/MoveTowardsRestrictionGoal.cpp | 2 +- Minecraft.World/MoveTowardsTargetGoal.cpp | 2 +- Minecraft.World/MusicTile.cpp | 6 +- Minecraft.World/NearestAttackableTargetGoal.cpp | 2 +- Minecraft.World/NetherBridgePieces.cpp | 2 +- Minecraft.World/OcelotSitOnTileGoal.cpp | 2 +- Minecraft.World/OfferFlowerGoal.cpp | 2 +- Minecraft.World/Ozelot.cpp | 4 +- Minecraft.World/PanicGoal.cpp | 2 +- Minecraft.World/Pig.cpp | 6 +- Minecraft.World/PigZombie.cpp | 6 +- Minecraft.World/PistonBaseTile.cpp | 10 +-- Minecraft.World/PistonMovingPiece.cpp | 10 +-- Minecraft.World/PlayGoal.cpp | 6 +- Minecraft.World/Player.cpp | 84 ++++++++++++------------- Minecraft.World/RandomStrollGoal.cpp | 4 +- Minecraft.World/RecordPlayerTile.cpp | 4 +- Minecraft.World/ResultSlot.cpp | 2 +- Minecraft.World/RotateHeadPacket.cpp | 2 +- Minecraft.World/SaddleItem.cpp | 4 +- Minecraft.World/SavedDataStorage.cpp | 6 +- Minecraft.World/SetEntityMotionPacket.cpp | 2 +- Minecraft.World/SetEquippedItemPacket.cpp | 2 +- Minecraft.World/SetRidingPacket.cpp | 2 +- Minecraft.World/Sheep.cpp | 6 +- Minecraft.World/SignItem.cpp | 2 +- Minecraft.World/SignTile.cpp | 2 +- Minecraft.World/Silverfish.cpp | 2 +- Minecraft.World/Skeleton.cpp | 4 +- Minecraft.World/SkullItem.cpp | 2 +- Minecraft.World/SkullTile.cpp | 6 +- Minecraft.World/Slime.cpp | 2 +- Minecraft.World/SmallFireball.cpp | 2 +- Minecraft.World/Snowball.cpp | 2 +- Minecraft.World/StrongholdPieces.cpp | 2 +- Minecraft.World/StructurePiece.cpp | 4 +- Minecraft.World/TakeFlowerGoal.cpp | 2 +- Minecraft.World/TargetGoal.cpp | 8 +-- Minecraft.World/TeleportEntityPacket.cpp | 2 +- Minecraft.World/TheEndPortal.cpp | 4 +- Minecraft.World/ThrownEnderpearl.cpp | 2 +- Minecraft.World/ThrownPotion.cpp | 2 +- Minecraft.World/TileDestructionPacket.cpp | 2 +- Minecraft.World/TntTile.cpp | 2 +- Minecraft.World/TreeTile.cpp | 2 +- Minecraft.World/UpdateMobEffectPacket.cpp | 2 +- Minecraft.World/Villager.cpp | 6 +- Minecraft.World/VillagerGolem.cpp | 2 +- Minecraft.World/WaterLilyTile.cpp | 2 +- Minecraft.World/Wolf.cpp | 8 +-- 123 files changed, 320 insertions(+), 320 deletions(-) (limited to 'Minecraft.World') diff --git a/Minecraft.World/AddGlobalEntityPacket.cpp b/Minecraft.World/AddGlobalEntityPacket.cpp index db476433..1041f47d 100644 --- a/Minecraft.World/AddGlobalEntityPacket.cpp +++ b/Minecraft.World/AddGlobalEntityPacket.cpp @@ -26,7 +26,7 @@ AddGlobalEntityPacket::AddGlobalEntityPacket(std::shared_ptr e) x = Mth::floor(e->x * 32); y = Mth::floor(e->y * 32); z = Mth::floor(e->z * 32); - if (dynamic_pointer_cast(e) != NULL) + if (std::dynamic_pointer_cast(e) != NULL) { this->type = LIGHTNING; } diff --git a/Minecraft.World/AgableMob.cpp b/Minecraft.World/AgableMob.cpp index a433076e..1377c01e 100644 --- a/Minecraft.World/AgableMob.cpp +++ b/Minecraft.World/AgableMob.cpp @@ -24,7 +24,7 @@ bool AgableMob::interact(std::shared_ptr player) eINSTANCEOF classToSpawn = EntityIO::getClass(item->getAuxValue()); if (classToSpawn != eTYPE_NOTSET && (classToSpawn & eTYPE_AGABLE_MOB) == eTYPE_AGABLE_MOB && classToSpawn == GetType() ) // 4J Added GetType() check to only spawn same type { - std::shared_ptr offspring = getBreedOffspring(dynamic_pointer_cast(shared_from_this())); + std::shared_ptr offspring = getBreedOffspring(std::dynamic_pointer_cast(shared_from_this())); if (offspring != NULL) { offspring->setAge(-20 * 60 * 20); diff --git a/Minecraft.World/Animal.cpp b/Minecraft.World/Animal.cpp index 36cdbe37..a56b0971 100644 --- a/Minecraft.World/Animal.cpp +++ b/Minecraft.World/Animal.cpp @@ -64,7 +64,7 @@ void Animal::aiStep() void Animal::checkHurtTarget(std::shared_ptr target, float d) { - if (dynamic_pointer_cast(target) != NULL) + if (std::dynamic_pointer_cast(target) != NULL) { if (d < 3) { @@ -75,7 +75,7 @@ void Animal::checkHurtTarget(std::shared_ptr target, float d) holdGround = true; } - std::shared_ptr p = dynamic_pointer_cast(target); + std::shared_ptr p = std::dynamic_pointer_cast(target); if (p->getSelectedItem() != NULL && this->isFood(p->getSelectedItem())) { } @@ -85,9 +85,9 @@ void Animal::checkHurtTarget(std::shared_ptr target, float d) } } - else if (dynamic_pointer_cast(target) != NULL) + else if (std::dynamic_pointer_cast(target) != NULL) { - std::shared_ptr a = dynamic_pointer_cast(target); + std::shared_ptr a = std::dynamic_pointer_cast(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 source = dmgSource->getDirectEntity(); - if (dynamic_pointer_cast(source) != NULL && !dynamic_pointer_cast(source)->isAllowedToAttackAnimals() ) + if (std::dynamic_pointer_cast(source) != NULL && !std::dynamic_pointer_cast(source)->isAllowedToAttackAnimals() ) { return false; } if (source != NULL && source->GetType() == eTYPE_ARROW) { - std::shared_ptr arrow = dynamic_pointer_cast(source); - if (dynamic_pointer_cast(arrow->owner) != NULL && ! dynamic_pointer_cast(arrow->owner)->isAllowedToAttackAnimals() ) + std::shared_ptr arrow = std::dynamic_pointer_cast(source); + if (std::dynamic_pointer_cast(arrow->owner) != NULL && ! std::dynamic_pointer_cast(arrow->owner)->isAllowedToAttackAnimals() ) { return false; } @@ -218,7 +218,7 @@ std::shared_ptr Animal::findAttackTarget() //for (int i = 0; i < others->size(); i++) for(AUTO_VAR(it, others->begin()); it != others->end(); ++it) { - std::shared_ptr p = dynamic_pointer_cast(*it); + std::shared_ptr p = std::dynamic_pointer_cast(*it); if (p != shared_from_this() && p->getInLoveValue() > 0) { delete others; @@ -237,7 +237,7 @@ std::shared_ptr Animal::findAttackTarget() { setDespawnProtected(); - std::shared_ptr p = dynamic_pointer_cast(*it); + std::shared_ptr p = std::dynamic_pointer_cast(*it); if (p->getSelectedItem() != NULL && this->isFood(p->getSelectedItem())) { delete players; @@ -252,7 +252,7 @@ std::shared_ptr Animal::findAttackTarget() //for (int i = 0; i < others.size(); i++) for(AUTO_VAR(it, others->begin()); it != others->end(); ++it) { - std::shared_ptr p = dynamic_pointer_cast(*it); + std::shared_ptr p = std::dynamic_pointer_cast(*it); if (p != shared_from_this() && p->getAge() < 0) { delete others; diff --git a/Minecraft.World/Arrow.cpp b/Minecraft.World/Arrow.cpp index 9edd2208..f599ab35 100644 --- a/Minecraft.World/Arrow.cpp +++ b/Minecraft.World/Arrow.cpp @@ -57,7 +57,7 @@ Arrow::Arrow(Level *level, std::shared_ptr mob, std::shared_ptr target _init(); this->owner = mob; - if ( dynamic_pointer_cast( mob ) != NULL) pickup = PICKUP_ALLOWED; + if ( std::dynamic_pointer_cast( mob ) != NULL) pickup = PICKUP_ALLOWED; y = mob->y + mob->getHeadHeight() - 0.1f; @@ -94,7 +94,7 @@ Arrow::Arrow(Level *level, std::shared_ptr mob, float power) : Entity( leve _init(); this->owner = mob; - if ( dynamic_pointer_cast( mob ) != NULL) pickup = PICKUP_ALLOWED; + if ( std::dynamic_pointer_cast( mob ) != NULL) pickup = PICKUP_ALLOWED; setSize(0.5f, 0.5f); @@ -281,11 +281,11 @@ void Arrow::tick() DamageSource *damageSource = NULL; if (owner == NULL) { - damageSource = DamageSource::arrow(dynamic_pointer_cast(shared_from_this()), shared_from_this()); + damageSource = DamageSource::arrow(std::dynamic_pointer_cast(shared_from_this()), shared_from_this()); } else { - damageSource = DamageSource::arrow(dynamic_pointer_cast(shared_from_this()), owner); + damageSource = DamageSource::arrow(std::dynamic_pointer_cast(shared_from_this()), owner); } if(res->entity->hurt(damageSource, dmg)) @@ -299,7 +299,7 @@ void Arrow::tick() res->entity->setOnFire(5); } - std::shared_ptr mob = dynamic_pointer_cast(res->entity); + std::shared_ptr mob = std::dynamic_pointer_cast(res->entity); if (mob != NULL) { mob->arrowCount++; @@ -319,12 +319,12 @@ void Arrow::tick() } // 4J : WESTY : For award, need to track if creeper was killed by arrow from the player. - if ( (dynamic_pointer_cast(owner) != NULL ) && // arrow owner is a player + if ( (std::dynamic_pointer_cast(owner) != NULL ) && // arrow owner is a player ( res->entity->isAlive() == false ) && // target is now dead - ( dynamic_pointer_cast( res->entity ) != NULL ) ) // target is a creeper + ( std::dynamic_pointer_cast( res->entity ) != NULL ) ) // target is a creeper { - dynamic_pointer_cast(owner)->awardStat( + std::dynamic_pointer_cast(owner)->awardStat( GenericStats::arrowKillCreeper(), GenericStats::param_arrowKillCreeper() ); diff --git a/Minecraft.World/ArrowAttackGoal.cpp b/Minecraft.World/ArrowAttackGoal.cpp index 735b8389..519b1743 100644 --- a/Minecraft.World/ArrowAttackGoal.cpp +++ b/Minecraft.World/ArrowAttackGoal.cpp @@ -72,13 +72,13 @@ void ArrowAttackGoal::fireAtTarget() std::shared_ptr tar = target.lock(); if (projectileType == ArrowType) { - std::shared_ptr arrow = std::shared_ptr( new Arrow(level, dynamic_pointer_cast(mob->shared_from_this()), tar, 1.60f, 12) ); + std::shared_ptr arrow = std::shared_ptr( new Arrow(level, std::dynamic_pointer_cast(mob->shared_from_this()), tar, 1.60f, 12) ); level->playSound(mob->shared_from_this(), eSoundType_RANDOM_BOW, 1.0f, 1 / (mob->getRandom()->nextFloat() * 0.4f + 0.8f)); level->addEntity(arrow); } else if (projectileType == SnowballType) { - std::shared_ptr snowball = std::shared_ptr( new Snowball(level, dynamic_pointer_cast(mob->shared_from_this())) ); + std::shared_ptr snowball = std::shared_ptr( new Snowball(level, std::dynamic_pointer_cast(mob->shared_from_this())) ); double xd = tar->x - mob->x; double yd = (tar->y + tar->getHeadHeight() - 1.1f) - snowball->y; double zd = tar->z - mob->z; diff --git a/Minecraft.World/AvoidPlayerGoal.cpp b/Minecraft.World/AvoidPlayerGoal.cpp index 56202028..d8743b84 100644 --- a/Minecraft.World/AvoidPlayerGoal.cpp +++ b/Minecraft.World/AvoidPlayerGoal.cpp @@ -33,7 +33,7 @@ bool AvoidPlayerGoal::canUse() { if (avoidType == typeid(Player)) { - std::shared_ptr tamableAnimal = dynamic_pointer_cast(mob->shared_from_this()); + std::shared_ptr tamableAnimal = std::dynamic_pointer_cast(mob->shared_from_this()); if (tamableAnimal != NULL && tamableAnimal->isTame()) return false; toAvoid = weak_ptr(mob->level->getNearestPlayer(mob->shared_from_this(), maxDist)); if (toAvoid.lock() == NULL) return false; @@ -52,7 +52,7 @@ bool AvoidPlayerGoal::canUse() if (!mob->getSensing()->canSee(toAvoid.lock())) return false; - Vec3 *pos = RandomPos::getPosAvoid(dynamic_pointer_cast(mob->shared_from_this()), 16, 7, Vec3::newTemp(toAvoid.lock()->x, toAvoid.lock()->y, toAvoid.lock()->z)); + Vec3 *pos = RandomPos::getPosAvoid(std::dynamic_pointer_cast(mob->shared_from_this()), 16, 7, Vec3::newTemp(toAvoid.lock()->x, toAvoid.lock()->y, toAvoid.lock()->z)); if (pos == NULL) return false; if (toAvoid.lock()->distanceToSqr(pos->x, pos->y, pos->z) < toAvoid.lock()->distanceToSqr(mob->shared_from_this())) return false; delete path; diff --git a/Minecraft.World/Blaze.cpp b/Minecraft.World/Blaze.cpp index 1218ec2c..09538e1b 100644 --- a/Minecraft.World/Blaze.cpp +++ b/Minecraft.World/Blaze.cpp @@ -154,7 +154,7 @@ void Blaze::checkHurtTarget(std::shared_ptr target, float d) level->levelEvent(nullptr, LevelEvent::SOUND_BLAZE_FIREBALL, (int) x, (int) y, (int) z, 0); // level.playSound(this, "mob.ghast.fireball", getSoundVolume(), (random.nextFloat() - random.nextFloat()) * 0.2f + 1.0f); for (int i = 0; i < 1; i++) { - std::shared_ptr ie = std::shared_ptr( new SmallFireball(level, dynamic_pointer_cast( shared_from_this() ), xd + random->nextGaussian() * sqd, yd, zd + random->nextGaussian() * sqd) ); + std::shared_ptr ie = std::shared_ptr( new SmallFireball(level, std::dynamic_pointer_cast( shared_from_this() ), xd + random->nextGaussian() * sqd, yd, zd + random->nextGaussian() * sqd) ); // Vec3 v = getViewVector(1); // ie.x = x + v.x * 1.5; ie->y = y + bbHeight / 2 + 0.5f; diff --git a/Minecraft.World/Boat.cpp b/Minecraft.World/Boat.cpp index 26f02203..77062279 100644 --- a/Minecraft.World/Boat.cpp +++ b/Minecraft.World/Boat.cpp @@ -100,8 +100,8 @@ bool Boat::hurt(DamageSource *source, int hurtDamage) { std::shared_ptr attacker = source->getDirectEntity(); - if (dynamic_pointer_cast(attacker) != NULL && - !dynamic_pointer_cast(attacker)->isAllowedToHurtEntity( shared_from_this() )) + if (std::dynamic_pointer_cast(attacker) != NULL && + !std::dynamic_pointer_cast(attacker)->isAllowedToHurtEntity( shared_from_this() )) return false; } @@ -117,7 +117,7 @@ bool Boat::hurt(DamageSource *source, int hurtDamage) markHurt(); // 4J Stu - Brought froward from 12w36 to fix #46611 - TU5: Gameplay: Minecarts and boat requires more hits than one to be destroyed in creative mode - std::shared_ptr player = dynamic_pointer_cast(source->getEntity()); + std::shared_ptr player = std::dynamic_pointer_cast(source->getEntity()); if (player != NULL && player->abilities.instabuild) setDamage(100); if (getDamage() > 20 * 2) @@ -469,7 +469,7 @@ wstring Boat::getName() bool Boat::interact(std::shared_ptr player) { - if (rider.lock() != NULL && dynamic_pointer_cast(rider.lock())!=NULL && rider.lock() != player) return true; + if (rider.lock() != NULL && std::dynamic_pointer_cast(rider.lock())!=NULL && rider.lock() != player) return true; if (!level->isClientSide) { // 4J HEG - Fixed issue with player not being able to dismount boat (issue #4446) diff --git a/Minecraft.World/BonusChestFeature.cpp b/Minecraft.World/BonusChestFeature.cpp index 7fa6c489..2fbe6ab9 100644 --- a/Minecraft.World/BonusChestFeature.cpp +++ b/Minecraft.World/BonusChestFeature.cpp @@ -58,7 +58,7 @@ bool BonusChestFeature::place(Level *level, Random *random, int x, int y, int z, if (force || ( level->isEmptyTile(x2, y2, z2) && level->isTopSolidBlocking(x2, y2 - 1, z2))) { level->setTile(x2, y2, z2, Tile::chest_Id); - std::shared_ptr chest = dynamic_pointer_cast(level->getTileEntity(x2, y2, z2)); + std::shared_ptr chest = std::dynamic_pointer_cast(level->getTileEntity(x2, y2, z2)); if (chest != NULL) { WeighedTreasure::addChestItems(random, treasureList, chest, numRolls); diff --git a/Minecraft.World/BossMobPart.cpp b/Minecraft.World/BossMobPart.cpp index 2f10a891..6997e86f 100644 --- a/Minecraft.World/BossMobPart.cpp +++ b/Minecraft.World/BossMobPart.cpp @@ -34,7 +34,7 @@ bool BossMobPart::isPickable() bool BossMobPart::hurt(DamageSource *source, int damage) { - return bossMob->hurt( dynamic_pointer_cast( shared_from_this() ), source, damage); + return bossMob->hurt( std::dynamic_pointer_cast( shared_from_this() ), source, damage); } bool BossMobPart::is(std::shared_ptr other) diff --git a/Minecraft.World/BreedGoal.cpp b/Minecraft.World/BreedGoal.cpp index f9427ccf..4f0ea5d5 100644 --- a/Minecraft.World/BreedGoal.cpp +++ b/Minecraft.World/BreedGoal.cpp @@ -52,7 +52,7 @@ std::shared_ptr BreedGoal::getFreePartner() vector > *others = level->getEntitiesOfClass(typeid(*animal), animal->bb->grow(r, r, r)); for(AUTO_VAR(it, others->begin()); it != others->end(); ++it) { - std::shared_ptr p = dynamic_pointer_cast(*it); + std::shared_ptr p = std::dynamic_pointer_cast(*it); if (animal->canMate(p)) { delete others; diff --git a/Minecraft.World/BrewingStandMenu.cpp b/Minecraft.World/BrewingStandMenu.cpp index 196b9bf8..ed8838d2 100644 --- a/Minecraft.World/BrewingStandMenu.cpp +++ b/Minecraft.World/BrewingStandMenu.cpp @@ -12,9 +12,9 @@ BrewingStandMenu::BrewingStandMenu(std::shared_ptr inventory, std::sh this->brewingStand = brewingStand; - addSlot(new PotionSlot(dynamic_pointer_cast( inventory->player->shared_from_this() ), brewingStand, 0, 56, 46)); - addSlot(new PotionSlot(dynamic_pointer_cast( inventory->player->shared_from_this() ), brewingStand, 1, 79, 53)); - addSlot(new PotionSlot(dynamic_pointer_cast( inventory->player->shared_from_this() ), brewingStand, 2, 102, 46)); + addSlot(new PotionSlot(std::dynamic_pointer_cast( inventory->player->shared_from_this() ), brewingStand, 0, 56, 46)); + addSlot(new PotionSlot(std::dynamic_pointer_cast( inventory->player->shared_from_this() ), brewingStand, 1, 79, 53)); + addSlot(new PotionSlot(std::dynamic_pointer_cast( inventory->player->shared_from_this() ), brewingStand, 2, 102, 46)); ingredientSlot = addSlot(new IngredientsSlot(brewingStand, 3, 79, 17)); for (int y = 0; y < 3; y++) @@ -190,7 +190,7 @@ int BrewingStandMenu::PotionSlot::getMaxStackSize() void BrewingStandMenu::PotionSlot::onTake(std::shared_ptr player, std::shared_ptr carried) { - carried->onCraftedBy(this->player->level, dynamic_pointer_cast( this->player->shared_from_this() ), 1); + carried->onCraftedBy(this->player->level, std::dynamic_pointer_cast( this->player->shared_from_this() ), 1); if (carried->id == Item::potion_Id && carried->getAuxValue() > 0) this->player->awardStat(GenericStats::potion(),GenericStats::param_potion()); Slot::onTake(player, carried); diff --git a/Minecraft.World/BrewingStandTile.cpp b/Minecraft.World/BrewingStandTile.cpp index 2a6fd2cd..681d6998 100644 --- a/Minecraft.World/BrewingStandTile.cpp +++ b/Minecraft.World/BrewingStandTile.cpp @@ -60,7 +60,7 @@ bool BrewingStandTile::use(Level *level, int x, int y, int z, std::shared_ptr brewingStand = dynamic_pointer_cast(level->getTileEntity(x, y, z)); + std::shared_ptr brewingStand = std::dynamic_pointer_cast(level->getTileEntity(x, y, z)); if (brewingStand != NULL) player->openBrewingStand(brewingStand); return true; @@ -79,9 +79,9 @@ void BrewingStandTile::animateTick(Level *level, int xt, int yt, int zt, Random void BrewingStandTile::onRemove(Level *level, int x, int y, int z, int id, int data) { std::shared_ptr tileEntity = level->getTileEntity(x, y, z); - if (tileEntity != NULL && ( dynamic_pointer_cast(tileEntity) != NULL) ) + if (tileEntity != NULL && ( std::dynamic_pointer_cast(tileEntity) != NULL) ) { - std::shared_ptr container = dynamic_pointer_cast(tileEntity); + std::shared_ptr container = std::dynamic_pointer_cast(tileEntity); for (int i = 0; i < container->getContainerSize(); i++) { std::shared_ptr item = container->getItem(i); diff --git a/Minecraft.World/BucketItem.cpp b/Minecraft.World/BucketItem.cpp index 0aac9c83..aca66908 100644 --- a/Minecraft.World/BucketItem.cpp +++ b/Minecraft.World/BucketItem.cpp @@ -120,7 +120,7 @@ std::shared_ptr BucketItem::use(std::shared_ptr item if (!level->mayInteract(player, xt, yt, zt,content)) { app.DebugPrintf("!!!!!!!!!!! Can't place that here\n"); - std::shared_ptr servPlayer = dynamic_pointer_cast(player); + std::shared_ptr servPlayer = std::dynamic_pointer_cast(player); if( servPlayer != NULL ) { app.DebugPrintf("Sending ChatPacket::e_ChatCannotPlaceLava to player\n"); diff --git a/Minecraft.World/CarrotOnAStickItem.cpp b/Minecraft.World/CarrotOnAStickItem.cpp index a0fbdcf6..ee0dd843 100644 --- a/Minecraft.World/CarrotOnAStickItem.cpp +++ b/Minecraft.World/CarrotOnAStickItem.cpp @@ -25,7 +25,7 @@ std::shared_ptr CarrotOnAStickItem::use(std::shared_ptrisRiding()) { - std::shared_ptr pig = dynamic_pointer_cast(player->riding); + std::shared_ptr pig = std::dynamic_pointer_cast(player->riding); if(pig) { if (pig->getControlGoal()->canBoost() && itemInstance->getMaxDamage() - itemInstance->getAuxValue() >= 7) diff --git a/Minecraft.World/CauldronTile.cpp b/Minecraft.World/CauldronTile.cpp index 1ff5d9b0..2f02e6c6 100644 --- a/Minecraft.World/CauldronTile.cpp +++ b/Minecraft.World/CauldronTile.cpp @@ -123,9 +123,9 @@ bool CauldronTile::use(Level *level, int x, int y, int z, std::shared_ptraddEntity(std::shared_ptr(new ItemEntity(level, x + 0.5, y + 1.5, z + 0.5, potion))); } // 4J Stu - Brought forward change to update inventory when filling bottles with water - else if (dynamic_pointer_cast( player ) != NULL) + else if (std::dynamic_pointer_cast( player ) != NULL) { - dynamic_pointer_cast( player )->refreshContainer(player->inventoryMenu); + std::dynamic_pointer_cast( player )->refreshContainer(player->inventoryMenu); } // 4J-PB - don't lose the water in creative mode if (player->abilities.instabuild==false) diff --git a/Minecraft.World/CaveSpider.cpp b/Minecraft.World/CaveSpider.cpp index 4bf98956..f9e4777d 100644 --- a/Minecraft.World/CaveSpider.cpp +++ b/Minecraft.World/CaveSpider.cpp @@ -32,7 +32,7 @@ bool CaveSpider::doHurtTarget(std::shared_ptr target) { if (Spider::doHurtTarget(target)) { - if ( dynamic_pointer_cast(target) != NULL) + if ( std::dynamic_pointer_cast(target) != NULL) { int poisonTime = 0; if (level->difficulty <= Difficulty::EASY) @@ -49,7 +49,7 @@ bool CaveSpider::doHurtTarget(std::shared_ptr target) } if (poisonTime > 0) { - dynamic_pointer_cast(target)->addEffect(new MobEffectInstance(MobEffect::poison->id, poisonTime * SharedConstants::TICKS_PER_SECOND, 0)); + std::dynamic_pointer_cast(target)->addEffect(new MobEffectInstance(MobEffect::poison->id, poisonTime * SharedConstants::TICKS_PER_SECOND, 0)); } } diff --git a/Minecraft.World/ChestTile.cpp b/Minecraft.World/ChestTile.cpp index 9c462713..bb3256b5 100644 --- a/Minecraft.World/ChestTile.cpp +++ b/Minecraft.World/ChestTile.cpp @@ -200,13 +200,13 @@ bool ChestTile::isFullChest(Level *level, int x, int y, int z) void ChestTile::neighborChanged(Level *level, int x, int y, int z, int type) { EntityTile::neighborChanged(level, x, y, z, type); - std::shared_ptr(cte) = dynamic_pointer_cast(level->getTileEntity(x, y, z)); + std::shared_ptr(cte) = std::dynamic_pointer_cast(level->getTileEntity(x, y, z)); if (cte != NULL) cte->clearCache(); } void ChestTile::onRemove(Level *level, int x, int y, int z, int id, int data) { - std::shared_ptr container = dynamic_pointer_cast( level->getTileEntity(x, y, z) ); + std::shared_ptr container = std::dynamic_pointer_cast( level->getTileEntity(x, y, z) ); if (container != NULL ) { for (unsigned int i = 0; i < container->getContainerSize(); i++) @@ -263,7 +263,7 @@ bool ChestTile::use(Level *level, int x, int y, int z, std::shared_ptr p return true; } - std::shared_ptr container = dynamic_pointer_cast( level->getTileEntity(x, y, z) ); + std::shared_ptr container = std::dynamic_pointer_cast( level->getTileEntity(x, y, z) ); if (container == NULL) return true; if (level->isSolidBlockingTile(x, y + 1, z)) return true; @@ -274,10 +274,10 @@ bool ChestTile::use(Level *level, int x, int y, int z, std::shared_ptr p if (level->getTile(x, y, z - 1) == id && (level->isSolidBlockingTile(x, y + 1, z - 1) || isCatSittingOnChest(level, x, y, z - 1))) return true; if (level->getTile(x, y, z + 1) == id && (level->isSolidBlockingTile(x, y + 1, z + 1) || isCatSittingOnChest(level, x, y, z + 1))) return true; - if (level->getTile(x - 1, y, z) == id) container = std::shared_ptr( new CompoundContainer(IDS_CHEST_LARGE, dynamic_pointer_cast( level->getTileEntity(x - 1, y, z) ), container) ); - if (level->getTile(x + 1, y, z) == id) container = std::shared_ptr( new CompoundContainer(IDS_CHEST_LARGE, container, dynamic_pointer_cast( level->getTileEntity(x + 1, y, z) )) ); - if (level->getTile(x, y, z - 1) == id) container = std::shared_ptr( new CompoundContainer(IDS_CHEST_LARGE, dynamic_pointer_cast( level->getTileEntity(x, y, z - 1) ), container) ); - if (level->getTile(x, y, z + 1) == id) container = std::shared_ptr( new CompoundContainer(IDS_CHEST_LARGE, container, dynamic_pointer_cast( level->getTileEntity(x, y, z + 1) )) ); + if (level->getTile(x - 1, y, z) == id) container = std::shared_ptr( new CompoundContainer(IDS_CHEST_LARGE, std::dynamic_pointer_cast( level->getTileEntity(x - 1, y, z) ), container) ); + if (level->getTile(x + 1, y, z) == id) container = std::shared_ptr( new CompoundContainer(IDS_CHEST_LARGE, container, std::dynamic_pointer_cast( level->getTileEntity(x + 1, y, z) )) ); + if (level->getTile(x, y, z - 1) == id) container = std::shared_ptr( new CompoundContainer(IDS_CHEST_LARGE, std::dynamic_pointer_cast( level->getTileEntity(x, y, z - 1) ), container) ); + if (level->getTile(x, y, z + 1) == id) container = std::shared_ptr( new CompoundContainer(IDS_CHEST_LARGE, container, std::dynamic_pointer_cast( level->getTileEntity(x, y, z + 1) )) ); player->openContainer(container); @@ -290,7 +290,7 @@ bool ChestTile::isCatSittingOnChest(Level *level, int x, int y, int z) vector > *entities = level->getEntitiesOfClass(typeid(Ozelot), AABB::newTemp(x, y + 1, z, x + 1, y + 2, z + 1)); for(AUTO_VAR(it, entities->begin()); it != entities->end(); ++it) { - std::shared_ptr ocelot = dynamic_pointer_cast(*it); + std::shared_ptr ocelot = std::dynamic_pointer_cast(*it); if(ocelot->isSitting()) { return true; diff --git a/Minecraft.World/ChestTileEntity.cpp b/Minecraft.World/ChestTileEntity.cpp index 85a7d389..d37b0a3e 100644 --- a/Minecraft.World/ChestTileEntity.cpp +++ b/Minecraft.World/ChestTileEntity.cpp @@ -165,19 +165,19 @@ void ChestTileEntity::checkNeighbors() if (level->getTile(x - 1, y, z) == Tile::chest_Id) { - w = dynamic_pointer_cast(level->getTileEntity(x - 1, y, z)); + w = std::dynamic_pointer_cast(level->getTileEntity(x - 1, y, z)); } if (level->getTile(x + 1, y, z) == Tile::chest_Id) { - e = dynamic_pointer_cast(level->getTileEntity(x + 1, y, z)); + e = std::dynamic_pointer_cast(level->getTileEntity(x + 1, y, z)); } if (level->getTile(x, y, z - 1) == Tile::chest_Id) { - n = dynamic_pointer_cast(level->getTileEntity(x, y, z - 1)); + n = std::dynamic_pointer_cast(level->getTileEntity(x, y, z - 1)); } if (level->getTile(x, y, z + 1) == Tile::chest_Id) { - s = dynamic_pointer_cast(level->getTileEntity(x, y, z + 1)); + s = std::dynamic_pointer_cast(level->getTileEntity(x, y, z + 1)); } if (n.lock() != NULL) n.lock()->clearCache(); diff --git a/Minecraft.World/ClientCommandPacket.cpp b/Minecraft.World/ClientCommandPacket.cpp index 4245fc3f..15aaefd0 100644 --- a/Minecraft.World/ClientCommandPacket.cpp +++ b/Minecraft.World/ClientCommandPacket.cpp @@ -24,7 +24,7 @@ void ClientCommandPacket::write(DataOutputStream *dos) void ClientCommandPacket::handle(PacketListener *listener) { - listener->handleClientCommand(dynamic_pointer_cast(shared_from_this())); + listener->handleClientCommand(std::dynamic_pointer_cast(shared_from_this())); } int ClientCommandPacket::getEstimatedSize() diff --git a/Minecraft.World/ContainerMenu.cpp b/Minecraft.World/ContainerMenu.cpp index 534da741..895defb6 100644 --- a/Minecraft.World/ContainerMenu.cpp +++ b/Minecraft.World/ContainerMenu.cpp @@ -90,7 +90,7 @@ std::shared_ptr ContainerMenu::clicked(int slotIndex, int buttonNu std::shared_ptr out = AbstractContainerMenu::clicked(slotIndex, buttonNum, clickType, player); #ifdef _EXTENDED_ACHIEVEMENTS - std::shared_ptr localPlayer = dynamic_pointer_cast(player); + std::shared_ptr localPlayer = std::dynamic_pointer_cast(player); if (localPlayer != NULL) // 4J-JEV: For "Chestful o'Cobblestone" achievement. { diff --git a/Minecraft.World/ControlledByPlayerGoal.cpp b/Minecraft.World/ControlledByPlayerGoal.cpp index ba46debe..a38bf77b 100644 --- a/Minecraft.World/ControlledByPlayerGoal.cpp +++ b/Minecraft.World/ControlledByPlayerGoal.cpp @@ -36,13 +36,13 @@ void ControlledByPlayerGoal::stop() bool ControlledByPlayerGoal::canUse() { - std::shared_ptr player = dynamic_pointer_cast( mob->rider.lock() ); + std::shared_ptr player = std::dynamic_pointer_cast( mob->rider.lock() ); return mob->isAlive() && player && (boosting || mob->canBeControlledByRider()); } void ControlledByPlayerGoal::tick() { - std::shared_ptr player = dynamic_pointer_cast(mob->rider.lock()); + std::shared_ptr player = std::dynamic_pointer_cast(mob->rider.lock()); PathfinderMob *pig = (PathfinderMob *)mob; float yrd = Mth::wrapDegrees(player->yRot - mob->yRot) * 0.5f; diff --git a/Minecraft.World/Creeper.cpp b/Minecraft.World/Creeper.cpp index 2403d3a4..f502c1e4 100644 --- a/Minecraft.World/Creeper.cpp +++ b/Minecraft.World/Creeper.cpp @@ -120,13 +120,13 @@ void Creeper::die(DamageSource *source) { Monster::die(source); - if ( dynamic_pointer_cast(source->getEntity()) != NULL ) + if ( std::dynamic_pointer_cast(source->getEntity()) != NULL ) { spawnAtLocation(Item::record_01_Id + random->nextInt(12), 1); } - std::shared_ptr player = dynamic_pointer_cast(source->getEntity()); - if ( (dynamic_pointer_cast(source->getDirectEntity()) != NULL) && (player != NULL) ) + std::shared_ptr player = std::dynamic_pointer_cast(source->getEntity()); + if ( (std::dynamic_pointer_cast(source->getDirectEntity()) != NULL) && (player != NULL) ) { player->awardStat(GenericStats::archer(), GenericStats::param_archer()); } diff --git a/Minecraft.World/DefendVillageTargetGoal.cpp b/Minecraft.World/DefendVillageTargetGoal.cpp index 87cb5fe3..2d2ac552 100644 --- a/Minecraft.World/DefendVillageTargetGoal.cpp +++ b/Minecraft.World/DefendVillageTargetGoal.cpp @@ -13,7 +13,7 @@ bool DefendVillageTargetGoal::canUse() { std::shared_ptr village = golem->getVillage(); if (village == NULL) return false; - potentialTarget = weak_ptr(village->getClosestAggressor(dynamic_pointer_cast(golem->shared_from_this()))); + potentialTarget = weak_ptr(village->getClosestAggressor(std::dynamic_pointer_cast(golem->shared_from_this()))); return canAttack(potentialTarget.lock(), false); } diff --git a/Minecraft.World/DispenserTile.cpp b/Minecraft.World/DispenserTile.cpp index 723aedc0..0002aa3e 100644 --- a/Minecraft.World/DispenserTile.cpp +++ b/Minecraft.World/DispenserTile.cpp @@ -107,7 +107,7 @@ bool DispenserTile::use(Level *level, int x, int y, int z, std::shared_ptr trap = dynamic_pointer_cast( level->getTileEntity(x, y, z) ); + std::shared_ptr trap = std::dynamic_pointer_cast( level->getTileEntity(x, y, z) ); player->openTrap(trap); return true; @@ -138,7 +138,7 @@ void DispenserTile::fireArrow(Level *level, int x, int y, int z, Random *random) xd = -1; } - std::shared_ptr trap = dynamic_pointer_cast( level->getTileEntity(x, y, z) ); + std::shared_ptr trap = std::dynamic_pointer_cast( level->getTileEntity(x, y, z) ); if(trap != NULL) { int slot=trap->getRandomSlot(); @@ -207,7 +207,7 @@ void DispenserTile::setPlacedBy(Level *level, int x, int y, int z, std::shared_p void DispenserTile::onRemove(Level *level, int x, int y, int z, int id, int data) { - std::shared_ptr container = dynamic_pointer_cast( level->getTileEntity(x, y, z) ); + std::shared_ptr container = std::dynamic_pointer_cast( level->getTileEntity(x, y, z) ); if (container != NULL ) { for (unsigned int i = 0; i < container->getContainerSize(); i++) @@ -422,7 +422,7 @@ int DispenserTile::dispenseItem(std::shared_ptr trap, Level //MonsterPlacerItem *spawnEgg = (MonsterPlacerItem *)item->getItem(); std::shared_ptr newEntity = MonsterPlacerItem::canSpawn(item->getAuxValue(), level,&iResult); - std::shared_ptr mob = dynamic_pointer_cast(newEntity); + std::shared_ptr mob = std::dynamic_pointer_cast(newEntity); if (mob != NULL) { // 4J-PB - Changed the line below slightly since mobs were sticking to the dispenser rather than dropping down when fired diff --git a/Minecraft.World/DragonFireball.cpp b/Minecraft.World/DragonFireball.cpp index 6146b8a1..4b6e8014 100644 --- a/Minecraft.World/DragonFireball.cpp +++ b/Minecraft.World/DragonFireball.cpp @@ -40,7 +40,7 @@ void DragonFireball::onHit(HitResult *res) for( AUTO_VAR(it, entitiesOfClass->begin()); it != entitiesOfClass->end(); ++it) { //std::shared_ptr e = *it; - std::shared_ptr e = dynamic_pointer_cast( *it ); + std::shared_ptr e = std::dynamic_pointer_cast( *it ); double dist = distanceToSqr(e); if (dist < SPLASH_RANGE_SQ) { diff --git a/Minecraft.World/DyePowderItem.cpp b/Minecraft.World/DyePowderItem.cpp index b92e7789..66d7df9c 100644 --- a/Minecraft.World/DyePowderItem.cpp +++ b/Minecraft.World/DyePowderItem.cpp @@ -291,9 +291,9 @@ mainloop: continue; bool DyePowderItem::interactEnemy(std::shared_ptr itemInstance, std::shared_ptr mob) { - if (dynamic_pointer_cast( mob ) != NULL) + if (std::dynamic_pointer_cast( mob ) != NULL) { - std::shared_ptr sheep = dynamic_pointer_cast(mob); + std::shared_ptr sheep = std::dynamic_pointer_cast(mob); // convert to tile-based color value (0 is white instead of black) int newColor = ClothTile::getTileDataForItemAuxValue(itemInstance->getAuxValue()); if (!sheep->isSheared() && sheep->getColor() != newColor) diff --git a/Minecraft.World/EggItem.cpp b/Minecraft.World/EggItem.cpp index 90c7d931..c3898782 100644 --- a/Minecraft.World/EggItem.cpp +++ b/Minecraft.World/EggItem.cpp @@ -25,7 +25,7 @@ std::shared_ptr EggItem::use(std::shared_ptr instanc { instance->count--; } - level->playSound( dynamic_pointer_cast(player), eSoundType_RANDOM_BOW, 0.5f, 0.4f / (random->nextFloat() * 0.4f + 0.8f)); - if (!level->isClientSide) level->addEntity( std::shared_ptr( new ThrownEgg(level, dynamic_pointer_cast( player )) )); + level->playSound( std::dynamic_pointer_cast(player), eSoundType_RANDOM_BOW, 0.5f, 0.4f / (random->nextFloat() * 0.4f + 0.8f)); + if (!level->isClientSide) level->addEntity( std::shared_ptr( new ThrownEgg(level, std::dynamic_pointer_cast( player )) )); return instance; } diff --git a/Minecraft.World/EnderChestTile.cpp b/Minecraft.World/EnderChestTile.cpp index 2240a070..e11d765c 100644 --- a/Minecraft.World/EnderChestTile.cpp +++ b/Minecraft.World/EnderChestTile.cpp @@ -64,7 +64,7 @@ void EnderChestTile::setPlacedBy(Level *level, int x, int y, int z, std::shared_ bool EnderChestTile::use(Level *level, int x, int y, int z, std::shared_ptr player, int clickedFace, float clickX, float clickY, float clickZ, bool soundOnly) { std::shared_ptr container = player->getEnderChestInventory(); - std::shared_ptr enderChest = dynamic_pointer_cast(level->getTileEntity(x, y, z)); + std::shared_ptr enderChest = std::dynamic_pointer_cast(level->getTileEntity(x, y, z)); if (container == NULL || enderChest == NULL) return true; if (level->isSolidBlockingTile(x, y + 1, z)) return true; diff --git a/Minecraft.World/EnderCrystal.cpp b/Minecraft.World/EnderCrystal.cpp index 7e43ef66..476eb5d5 100644 --- a/Minecraft.World/EnderCrystal.cpp +++ b/Minecraft.World/EnderCrystal.cpp @@ -91,7 +91,7 @@ bool EnderCrystal::isPickable() bool EnderCrystal::hurt(DamageSource *source, int damage) { // 4J-PB - if the owner of the source is the enderdragon, then ignore it (where the dragon's fireball hits an endercrystal) - std::shared_ptr sourceIsDragon = dynamic_pointer_cast(source->getEntity()); + std::shared_ptr sourceIsDragon = std::dynamic_pointer_cast(source->getEntity()); if(sourceIsDragon!=NULL) { @@ -114,7 +114,7 @@ bool EnderCrystal::hurt(DamageSource *source, int damage) for (AUTO_VAR(it, entities.begin()); it != itEnd; it++) { std::shared_ptr e = *it; //entities->at(i); - dragon = dynamic_pointer_cast(e); + dragon = std::dynamic_pointer_cast(e); if(dragon != NULL) { dragon->handleCrystalDestroyed(source); diff --git a/Minecraft.World/EnderDragon.cpp b/Minecraft.World/EnderDragon.cpp index d93dc3bd..7ecd6a3b 100644 --- a/Minecraft.World/EnderDragon.cpp +++ b/Minecraft.World/EnderDragon.cpp @@ -444,7 +444,7 @@ void EnderDragon::aiStep() for( AUTO_VAR(it, targets->begin() ); it != targets->end(); ++it) { - std::shared_ptr e = dynamic_pointer_cast( *it ); + std::shared_ptr e = std::dynamic_pointer_cast( *it ); if (e != NULL) { //app.DebugPrintf("Attacking entity with acid\n"); @@ -734,7 +734,7 @@ void EnderDragon::aiStep() double zdd = attackTarget->z - startingZ; level->levelEvent(nullptr, LevelEvent::SOUND_GHAST_FIREBALL, (int) x, (int) y, (int) z, 0); - std::shared_ptr ie = std::shared_ptr( new DragonFireball(level, dynamic_pointer_cast( shared_from_this() ), xdd, ydd, zdd) ); + std::shared_ptr ie = std::shared_ptr( new DragonFireball(level, std::dynamic_pointer_cast( shared_from_this() ), xdd, ydd, zdd) ); ie->x = startingX; ie->y = startingY; ie->z = startingZ; @@ -800,7 +800,7 @@ void EnderDragon::checkCrystals() //for (Entity ec : crystals) for(AUTO_VAR(it, crystals->begin()); it != crystals->end(); ++it) { - std::shared_ptr ec = dynamic_pointer_cast( *it ); + std::shared_ptr ec = std::dynamic_pointer_cast( *it ); double dist = ec->distanceToSqr(shared_from_this() ); if (dist < nearest) { @@ -840,7 +840,7 @@ void EnderDragon::knockBack(vector > *entities) //for (Entity e : entities) for(AUTO_VAR(it, entities->begin()); it != entities->end(); ++it) { - std::shared_ptr e = dynamic_pointer_cast( *it ); + std::shared_ptr e = std::dynamic_pointer_cast( *it ); if (e != NULL)//(e instanceof Mob) { double xd = e->x - xm; @@ -856,10 +856,10 @@ void EnderDragon::hurt(vector > *entities) //for (int i = 0; i < entities->size(); i++) for(AUTO_VAR(it, entities->begin()); it != entities->end(); ++it) { - std::shared_ptr e = dynamic_pointer_cast( *it );//entities.get(i); + std::shared_ptr e = std::dynamic_pointer_cast( *it );//entities.get(i); if (e != NULL) //(e instanceof Mob) { - DamageSource *damageSource = DamageSource::mobAttack( dynamic_pointer_cast( shared_from_this() )); + DamageSource *damageSource = DamageSource::mobAttack( std::dynamic_pointer_cast( shared_from_this() )); e->hurt(damageSource, 10); delete damageSource; } @@ -1116,7 +1116,7 @@ bool EnderDragon::hurt(std::shared_ptr bossMobPart, DamageSource *s //zTarget = z - cc1 * 5 + (random->nextFloat() - 0.5f) * 2; //attackTarget = NULL; - if (source == DamageSource::explosion || (dynamic_pointer_cast(source->getEntity()) != NULL)) + if (source == DamageSource::explosion || (std::dynamic_pointer_cast(source->getEntity()) != NULL)) { int healthBefore = health; reallyHurt(source, damage); @@ -1461,11 +1461,11 @@ void EnderDragon::handleCrystalDestroyed(DamageSource *source) #endif } } - else if(dynamic_pointer_cast(source->getEntity()) != NULL) + else if(std::dynamic_pointer_cast(source->getEntity()) != NULL) { if(setSynchedAction(e_EnderdragonAction_StrafePlayer)) { - attackTarget = dynamic_pointer_cast(source->getEntity()); + attackTarget = std::dynamic_pointer_cast(source->getEntity()); #if PRINT_DRAGON_STATE_CHANGE_MESSAGES app.DebugPrintf("Dragon action is now: StrafePlayer\n"); #endif diff --git a/Minecraft.World/EnderMan.cpp b/Minecraft.World/EnderMan.cpp index e5995587..e19e8ba6 100644 --- a/Minecraft.World/EnderMan.cpp +++ b/Minecraft.World/EnderMan.cpp @@ -211,7 +211,7 @@ void EnderMan::aiStep() { if (attackTarget != NULL) { - if ( dynamic_pointer_cast(attackTarget) != NULL && isLookingAtMe(dynamic_pointer_cast(attackTarget))) + if ( std::dynamic_pointer_cast(attackTarget) != NULL && isLookingAtMe(std::dynamic_pointer_cast(attackTarget))) { xxa = yya = 0; runSpeed = 0; diff --git a/Minecraft.World/Entity.cpp b/Minecraft.World/Entity.cpp index 6b602f6e..d88d361b 100644 --- a/Minecraft.World/Entity.cpp +++ b/Minecraft.World/Entity.cpp @@ -670,7 +670,7 @@ void Entity::move(double xa, double ya, double za, bool noEntityCubes) // 4J - AABB *bbOrg = bb->copy(); - bool isPlayerSneaking = onGround && isSneaking() && dynamic_pointer_cast(shared_from_this()) != NULL; + bool isPlayerSneaking = onGround && isSneaking() && std::dynamic_pointer_cast(shared_from_this()) != NULL; if (isPlayerSneaking) { @@ -1001,7 +1001,7 @@ void Entity::checkFallDamage(double ya, bool onGround) { if (fallDistance > 0) { - if (dynamic_pointer_cast(shared_from_this()) != NULL) + if (std::dynamic_pointer_cast(shared_from_this()) != NULL) { int xt = Mth::floor(x); int yt = Mth::floor(y - 0.2f - this->heightOffset); @@ -1534,7 +1534,7 @@ void Entity::positionRider() std::shared_ptr lockedRider = rider.lock(); if( lockedRider ) { - std::shared_ptr player = dynamic_pointer_cast(lockedRider); + std::shared_ptr player = std::dynamic_pointer_cast(lockedRider); if (!(player && player->isLocalPlayer())) { lockedRider->xOld = xOld; diff --git a/Minecraft.World/EntityDamageSource.cpp b/Minecraft.World/EntityDamageSource.cpp index 266c867f..e05b0e80 100644 --- a/Minecraft.World/EntityDamageSource.cpp +++ b/Minecraft.World/EntityDamageSource.cpp @@ -26,7 +26,7 @@ std::shared_ptr EntityDamageSource::getDeathMessagePacket(std::share wstring additional = L""; if(entity->GetType() == eTYPE_SERVERPLAYER) { - std::shared_ptr sourcePlayer = dynamic_pointer_cast(entity); + std::shared_ptr sourcePlayer = std::dynamic_pointer_cast(entity); if(sourcePlayer != NULL) additional = sourcePlayer->name; } return std::shared_ptr( new ChatPacket(player->name, m_msgId, entity->GetType(), additional ) ); @@ -34,5 +34,5 @@ std::shared_ptr EntityDamageSource::getDeathMessagePacket(std::share bool EntityDamageSource::scalesWithDifficulty() { - return entity != NULL && dynamic_pointer_cast(entity) && !(dynamic_pointer_cast(entity)); + return entity != NULL && std::dynamic_pointer_cast(entity) && !(std::dynamic_pointer_cast(entity)); } \ No newline at end of file diff --git a/Minecraft.World/Explosion.cpp b/Minecraft.World/Explosion.cpp index c3facfe7..e49885a2 100644 --- a/Minecraft.World/Explosion.cpp +++ b/Minecraft.World/Explosion.cpp @@ -149,7 +149,7 @@ void Explosion::explode() e->yd += ya * push; e->zd += za * push; - std::shared_ptr player = dynamic_pointer_cast(e); + std::shared_ptr player = std::dynamic_pointer_cast(e); if (player != NULL) { //app.DebugPrintf("Adding player knockback (%f,%f,%f)\n", xa * pow, ya * pow, za * pow); diff --git a/Minecraft.World/FarmTile.cpp b/Minecraft.World/FarmTile.cpp index 72d428bb..36e337fd 100644 --- a/Minecraft.World/FarmTile.cpp +++ b/Minecraft.World/FarmTile.cpp @@ -81,7 +81,7 @@ void FarmTile::fallOn(Level *level, int x, int y, int z, std::shared_ptr if (!level->isClientSide && level->random->nextFloat() < (fallDistance - .5f)) { // Fix for #60547 - TU7: Content: Gameplay: Players joining a game can destroy crops even with Trust Players option disabled. - std::shared_ptr player = dynamic_pointer_cast(entity); + std::shared_ptr player = std::dynamic_pointer_cast(entity); if(player == NULL || player->isAllowedToMine()) level->setTile(x, y, z, Tile::dirt_Id); } } diff --git a/Minecraft.World/Fireball.cpp b/Minecraft.World/Fireball.cpp index 4f2b53a0..894e3a8c 100644 --- a/Minecraft.World/Fireball.cpp +++ b/Minecraft.World/Fireball.cpp @@ -298,7 +298,7 @@ void Fireball::onHit(HitResult *res) { if (res->entity != NULL) { - DamageSource *damageSource = DamageSource::fireball(dynamic_pointer_cast( shared_from_this() ), owner); + DamageSource *damageSource = DamageSource::fireball(std::dynamic_pointer_cast( shared_from_this() ), owner); if (res->entity->hurt(damageSource, 6)) { } @@ -374,7 +374,7 @@ bool Fireball::hurt(DamageSource *source, int damage) yPower = yd * 0.1; zPower = zd * 0.1; } - std::shared_ptr mob = dynamic_pointer_cast( source->getEntity() ); + std::shared_ptr mob = std::dynamic_pointer_cast( source->getEntity() ); if (mob != NULL) { owner = mob; diff --git a/Minecraft.World/FishingHook.cpp b/Minecraft.World/FishingHook.cpp index d1fd5bb6..024389fb 100644 --- a/Minecraft.World/FishingHook.cpp +++ b/Minecraft.World/FishingHook.cpp @@ -58,7 +58,7 @@ FishingHook::FishingHook(Level *level, double x, double y, double z, std::shared this->owner = owner; // 4J Stu - Moved this outside the ctor - //owner->fishing = dynamic_pointer_cast( shared_from_this() ); + //owner->fishing = std::dynamic_pointer_cast( shared_from_this() ); setPos(x, y, z); } @@ -69,7 +69,7 @@ FishingHook::FishingHook(Level *level, std::shared_ptr mob) : Entity( le this->owner = mob; // 4J Stu - Moved this outside the ctor - //owner->fishing = dynamic_pointer_cast( shared_from_this() ); + //owner->fishing = std::dynamic_pointer_cast( shared_from_this() ); this->moveTo(mob->x, mob->y + 1.62 - mob->heightOffset, mob->z, mob->yRot, mob->xRot); @@ -265,7 +265,7 @@ void FishingHook::tick() if (res->entity != NULL) { // 4J Stu Move fix for : fix for #48587 - CRASH: Code: Gameplay: Hitting another player with the fishing bobber crashes the game. [Fishing pole, line] - // Incorrect dynamic_pointer_cast used around the shared_from_this() + // Incorrect std::dynamic_pointer_cast used around the shared_from_this() DamageSource *damageSource = DamageSource::thrown(shared_from_this(), owner); if (res->entity->hurt(damageSource, 0)) { diff --git a/Minecraft.World/FollowParentGoal.cpp b/Minecraft.World/FollowParentGoal.cpp index 99224d08..7ef56f06 100644 --- a/Minecraft.World/FollowParentGoal.cpp +++ b/Minecraft.World/FollowParentGoal.cpp @@ -24,7 +24,7 @@ bool FollowParentGoal::canUse() double closestDistSqr = Double::MAX_VALUE; for(AUTO_VAR(it, parents->begin()); it != parents->end(); ++it) { - std::shared_ptr parent = dynamic_pointer_cast(*it); + std::shared_ptr parent = std::dynamic_pointer_cast(*it); if (parent->getAge() < 0) continue; double distSqr = animal->distanceToSqr(parent); if (distSqr > closestDistSqr) continue; diff --git a/Minecraft.World/FurnaceMenu.cpp b/Minecraft.World/FurnaceMenu.cpp index 58f3b77d..9da3ebb0 100644 --- a/Minecraft.World/FurnaceMenu.cpp +++ b/Minecraft.World/FurnaceMenu.cpp @@ -18,7 +18,7 @@ FurnaceMenu::FurnaceMenu(std::shared_ptr inventory, std::shared_ptr( inventory->player->shared_from_this() ), furnace, 2, 112 + 4, 31 + 4)); + addSlot(new FurnaceResultSlot( std::dynamic_pointer_cast( inventory->player->shared_from_this() ), furnace, 2, 112 + 4, 31 + 4)); for (int y = 0; y < 3; y++) { diff --git a/Minecraft.World/FurnaceTile.cpp b/Minecraft.World/FurnaceTile.cpp index 23270eee..39106395 100644 --- a/Minecraft.World/FurnaceTile.cpp +++ b/Minecraft.World/FurnaceTile.cpp @@ -112,7 +112,7 @@ bool FurnaceTile::use(Level *level, int x, int y, int z, std::shared_ptr { return true; } - std::shared_ptr furnace = dynamic_pointer_cast( level->getTileEntity(x, y, z) ); + std::shared_ptr furnace = std::dynamic_pointer_cast( level->getTileEntity(x, y, z) ); if (furnace != NULL ) player->openFurnace(furnace); return true; } @@ -154,7 +154,7 @@ void FurnaceTile::onRemove(Level *level, int x, int y, int z, int id, int data) { if (!noDrop) { - std::shared_ptr container = dynamic_pointer_cast( level->getTileEntity(x, y, z) ); + std::shared_ptr container = std::dynamic_pointer_cast( level->getTileEntity(x, y, z) ); if( container != NULL ) { for (unsigned int i = 0; i < container->getContainerSize(); i++) diff --git a/Minecraft.World/Ghast.cpp b/Minecraft.World/Ghast.cpp index 9e66830d..bfc6521e 100644 --- a/Minecraft.World/Ghast.cpp +++ b/Minecraft.World/Ghast.cpp @@ -49,7 +49,7 @@ bool Ghast::hurt(DamageSource *source, int dmg) { if (source->getMsgId() == ChatPacket::e_ChatDeathFireball) { - std::shared_ptr player = dynamic_pointer_cast( source->getEntity() ); + std::shared_ptr player = std::dynamic_pointer_cast( source->getEntity() ); if (player != NULL) { // reflected fireball, kill the ghast @@ -151,7 +151,7 @@ void Ghast::serverAiStep() { // 4J - change brought forward from 1.2.3 level->levelEvent(nullptr, LevelEvent::SOUND_GHAST_FIREBALL, (int) x, (int) y, (int) z, 0); - std::shared_ptr ie = std::shared_ptr( new Fireball(level, dynamic_pointer_cast( shared_from_this() ), xdd, ydd, zdd) ); + std::shared_ptr ie = std::shared_ptr( new Fireball(level, std::dynamic_pointer_cast( shared_from_this() ), xdd, ydd, zdd) ); double d = 4; Vec3 *v = getViewVector(1); ie->x = x + v->x * d; diff --git a/Minecraft.World/HangingEntity.cpp b/Minecraft.World/HangingEntity.cpp index fcf80e07..a938acbc 100644 --- a/Minecraft.World/HangingEntity.cpp +++ b/Minecraft.World/HangingEntity.cpp @@ -156,7 +156,7 @@ bool HangingEntity::survives() for (AUTO_VAR(it, entities->begin()); it != itEnd; it++) { std::shared_ptr e = (*it); - if(dynamic_pointer_cast(e) != NULL) + if(std::dynamic_pointer_cast(e) != NULL) { return false; } @@ -176,7 +176,7 @@ bool HangingEntity::skipAttackInteraction(std::shared_ptr source) { if(source->GetType()==eTYPE_PLAYER) { - return hurt(DamageSource::playerAttack(dynamic_pointer_cast( source)), 0); + return hurt(DamageSource::playerAttack(std::dynamic_pointer_cast( source)), 0); } return false; } @@ -189,7 +189,7 @@ bool HangingEntity::hurt(DamageSource *source, int damage) { std::shared_ptr sourceEntity = source->getDirectEntity(); - if (dynamic_pointer_cast(sourceEntity) != NULL && !dynamic_pointer_cast(sourceEntity)->isAllowedToHurtEntity(shared_from_this()) ) + if (std::dynamic_pointer_cast(sourceEntity) != NULL && !std::dynamic_pointer_cast(sourceEntity)->isAllowedToHurtEntity(shared_from_this()) ) { return false; } @@ -202,7 +202,7 @@ bool HangingEntity::hurt(DamageSource *source, int damage) std::shared_ptr e = source->getEntity(); if (e!=NULL && ((e->GetType() & eTYPE_PLAYER)!=0) ) // check if it's serverplayer or player { - player = dynamic_pointer_cast( e ); + player = std::dynamic_pointer_cast( e ); } if (player != NULL && player->abilities.instabuild) diff --git a/Minecraft.World/HangingEntityItem.cpp b/Minecraft.World/HangingEntityItem.cpp index 2e299b73..cec15082 100644 --- a/Minecraft.World/HangingEntityItem.cpp +++ b/Minecraft.World/HangingEntityItem.cpp @@ -72,13 +72,13 @@ std::shared_ptr HangingEntityItem::createEntity(Level *level, int std::shared_ptr painting = std::shared_ptr(new Painting(level, x, y, z, dir)); painting->PaintingPostConstructor(dir); - return dynamic_pointer_cast (painting); + return std::dynamic_pointer_cast (painting); } else if (eType == eTYPE_ITEM_FRAME) { std::shared_ptr itemFrame = std::shared_ptr(new ItemFrame(level, x, y, z, dir)); - return dynamic_pointer_cast (itemFrame); + return std::dynamic_pointer_cast (itemFrame); } else { diff --git a/Minecraft.World/HurtByTargetGoal.cpp b/Minecraft.World/HurtByTargetGoal.cpp index 5570e37a..6078d03f 100644 --- a/Minecraft.World/HurtByTargetGoal.cpp +++ b/Minecraft.World/HurtByTargetGoal.cpp @@ -25,7 +25,7 @@ void HurtByTargetGoal::start() vector > *nearby = mob->level->getEntitiesOfClass(typeid(*mob), AABB::newTemp(mob->x, mob->y, mob->z, mob->x + 1, mob->y + 1, mob->z + 1)->grow(within, 4, within)); for(AUTO_VAR(it, nearby->begin()); it != nearby->end(); ++it) { - std::shared_ptr other = dynamic_pointer_cast(*it); + std::shared_ptr other = std::dynamic_pointer_cast(*it); if (this->mob->shared_from_this() == other) continue; if (other->getTarget() != NULL) continue; other->setTarget(mob->getLastHurtByMob()); diff --git a/Minecraft.World/IndirectEntityDamageSource.cpp b/Minecraft.World/IndirectEntityDamageSource.cpp index 009af37e..63640dc5 100644 --- a/Minecraft.World/IndirectEntityDamageSource.cpp +++ b/Minecraft.World/IndirectEntityDamageSource.cpp @@ -36,7 +36,7 @@ std::shared_ptr IndirectEntityDamageSource::getDeathMessagePacket(st type = owner->GetType(); if(type == eTYPE_SERVERPLAYER) { - std::shared_ptr sourcePlayer = dynamic_pointer_cast(owner); + std::shared_ptr sourcePlayer = std::dynamic_pointer_cast(owner); if(sourcePlayer != NULL) additional = sourcePlayer->name; } } diff --git a/Minecraft.World/Inventory.cpp b/Minecraft.World/Inventory.cpp index 7218e14c..728dd6bd 100644 --- a/Minecraft.World/Inventory.cpp +++ b/Minecraft.World/Inventory.cpp @@ -606,7 +606,7 @@ void Inventory::hurtArmor(int dmg) { if (armor[i] != NULL && dynamic_cast( armor[i]->getItem() ) != NULL ) { - armor[i]->hurt(dmg, dynamic_pointer_cast( player->shared_from_this() ) ); + armor[i]->hurt(dmg, std::dynamic_pointer_cast( player->shared_from_this() ) ); if (armor[i]->count == 0) { armor[i] = nullptr; diff --git a/Minecraft.World/ItemEntity.cpp b/Minecraft.World/ItemEntity.cpp index 5c3a4515..28b3158b 100644 --- a/Minecraft.World/ItemEntity.cpp +++ b/Minecraft.World/ItemEntity.cpp @@ -137,7 +137,7 @@ void ItemEntity::mergeWithNeighbours() vector > *neighbours = level->getEntitiesOfClass(typeid(*this), bb->grow(0.5, 0, 0.5)); for(AUTO_VAR(it, neighbours->begin()); it != neighbours->end(); ++it) { - std::shared_ptr entity = dynamic_pointer_cast(*it); + std::shared_ptr entity = std::dynamic_pointer_cast(*it); merge(entity); } delete neighbours; @@ -154,7 +154,7 @@ bool ItemEntity::merge(std::shared_ptr target) if (targetItem->hasTag() ^ myItem->hasTag()) return false; if (targetItem->hasTag() && !targetItem->getTag()->equals(myItem->getTag())) return false; if (targetItem->getItem()->isStackedByData() && targetItem->getAuxValue() != myItem->getAuxValue()) return false; - if (targetItem->count < myItem->count) return target->merge(dynamic_pointer_cast(shared_from_this())); + if (targetItem->count < myItem->count) return target->merge(std::dynamic_pointer_cast(shared_from_this())); if (targetItem->count + myItem->count > targetItem->getMaxStackSize()) return false; targetItem->count += myItem->count; diff --git a/Minecraft.World/ItemFrame.cpp b/Minecraft.World/ItemFrame.cpp index ec412b33..26766fb1 100644 --- a/Minecraft.World/ItemFrame.cpp +++ b/Minecraft.World/ItemFrame.cpp @@ -66,7 +66,7 @@ void ItemFrame::setItem(std::shared_ptr item) item = item->copy(); item->count = 1; - item->setFramed(dynamic_pointer_cast( shared_from_this() )); + item->setFramed(std::dynamic_pointer_cast( shared_from_this() )); } getEntityData()->set(DATA_ITEM, item); getEntityData()->markDirty(DATA_ITEM); diff --git a/Minecraft.World/ItemInstance.cpp b/Minecraft.World/ItemInstance.cpp index 99b9fb74..ae18faa9 100644 --- a/Minecraft.World/ItemInstance.cpp +++ b/Minecraft.World/ItemInstance.cpp @@ -216,7 +216,7 @@ void ItemInstance::hurt(int i, std::shared_ptr owner) return; } - std::shared_ptr player = dynamic_pointer_cast(owner); + std::shared_ptr player = std::dynamic_pointer_cast(owner); if (i > 0 && player != NULL) { int enchanted = EnchantmentHelper::getDigDurability(player->inventory); diff --git a/Minecraft.World/KillCommand.cpp b/Minecraft.World/KillCommand.cpp index 3a82378b..f7a3bbf8 100644 --- a/Minecraft.World/KillCommand.cpp +++ b/Minecraft.World/KillCommand.cpp @@ -11,7 +11,7 @@ EGameCommand KillCommand::getId() void KillCommand::execute(std::shared_ptr source, byteArray commandData) { - std::shared_ptr player = dynamic_pointer_cast(source); + std::shared_ptr player = std::dynamic_pointer_cast(source); player->hurt(DamageSource::outOfWorld, 1000); diff --git a/Minecraft.World/Level.cpp b/Minecraft.World/Level.cpp index 3ad39b66..c4a61287 100644 --- a/Minecraft.World/Level.cpp +++ b/Minecraft.World/Level.cpp @@ -568,7 +568,7 @@ Level::Level(std::shared_ptr levelStorage, const wstring& name, Di if( !this->levelData->useNewSeaLevel() ) seaLevel = Level::genDepth / 2; // 4J added - sea level is one unit lower since 1.8.2, maintain older height for old levels this->savedDataStorage = new SavedDataStorage(levelStorage.get()); - std::shared_ptr savedVillages = dynamic_pointer_cast(savedDataStorage->get(typeid(Villages), Villages::VILLAGE_FILE_ID)); + std::shared_ptr savedVillages = std::dynamic_pointer_cast(savedDataStorage->get(typeid(Villages), Villages::VILLAGE_FILE_ID)); if (savedVillages == NULL) { villages = std::shared_ptr(new Villages(this)); @@ -597,7 +597,7 @@ Level::Level(Level *level, Dimension *dimension) if( !this->levelData->useNewSeaLevel() ) seaLevel = Level::genDepth / 2; // 4J added - sea level is one unit lower since 1.8.2, maintain older height for old levels this->savedDataStorage = new SavedDataStorage( levelStorage.get() ); - std::shared_ptr savedVillages = dynamic_pointer_cast(savedDataStorage->get(typeid(Villages), Villages::VILLAGE_FILE_ID)); + std::shared_ptr savedVillages = std::dynamic_pointer_cast(savedDataStorage->get(typeid(Villages), Villages::VILLAGE_FILE_ID)); if (savedVillages == NULL) { villages = std::shared_ptr(new Villages(this)); @@ -636,7 +636,7 @@ void Level::_init(std::shared_ptrlevelStorage, const wstring& leve this->levelStorage = levelStorage;//std::shared_ptr(levelStorage); this->savedDataStorage = new SavedDataStorage(levelStorage.get()); - std::shared_ptr savedVillages = dynamic_pointer_cast(savedDataStorage->get(typeid(Villages), Villages::VILLAGE_FILE_ID)); + std::shared_ptr savedVillages = std::dynamic_pointer_cast(savedDataStorage->get(typeid(Villages), Villages::VILLAGE_FILE_ID)); if (savedVillages == NULL) { villages = std::shared_ptr(new Villages(this)); @@ -1667,16 +1667,16 @@ bool Level::addEntity(std::shared_ptr e) } bool forced = false; - if (dynamic_pointer_cast( e ) != NULL) + if (std::dynamic_pointer_cast( e ) != NULL) { forced = true; } if (forced || hasChunk(xc, zc)) { - if (dynamic_pointer_cast( e ) != NULL) + if (std::dynamic_pointer_cast( e ) != NULL) { - std::shared_ptr player = dynamic_pointer_cast(e); + std::shared_ptr player = std::dynamic_pointer_cast(e); // 4J Stu - Added so we don't continually add the player to the players list while they are dead if( find( players.begin(), players.end(), e ) == players.end() ) @@ -1744,11 +1744,11 @@ void Level::removeEntity(std::shared_ptr e) e->ride(nullptr); } e->remove(); - if (dynamic_pointer_cast( e ) != NULL) + if (std::dynamic_pointer_cast( e ) != NULL) { vector >::iterator it = players.begin(); vector >::iterator itEnd = players.end(); - while( it != itEnd && *it != dynamic_pointer_cast(e) ) + while( it != itEnd && *it != std::dynamic_pointer_cast(e) ) it++; if( it != itEnd ) @@ -1766,11 +1766,11 @@ void Level::removeEntityImmediately(std::shared_ptr e) { e->remove(); - if (dynamic_pointer_cast( e ) != NULL) + if (std::dynamic_pointer_cast( e ) != NULL) { vector >::iterator it = players.begin(); vector >::iterator itEnd = players.end(); - while( it != itEnd && *it != dynamic_pointer_cast(e) ) + while( it != itEnd && *it != std::dynamic_pointer_cast(e) ) it++; if( it != itEnd ) @@ -2286,7 +2286,7 @@ void Level::tickEntities() if (!e->removed) { #ifndef _FINAL_BUILD - if(!( app.DebugSettingsOn() && app.GetMobsDontTickEnabled() && (dynamic_pointer_cast(e) != NULL) && (dynamic_pointer_cast(e) == NULL))) + if(!( app.DebugSettingsOn() && app.GetMobsDontTickEnabled() && (std::dynamic_pointer_cast(e) != NULL) && (std::dynamic_pointer_cast(e) == NULL))) #endif { tick(e); diff --git a/Minecraft.World/LevelChunk.cpp b/Minecraft.World/LevelChunk.cpp index b27fb611..90450f6f 100644 --- a/Minecraft.World/LevelChunk.cpp +++ b/Minecraft.World/LevelChunk.cpp @@ -1639,10 +1639,10 @@ void LevelChunk::getEntitiesOfClass(const type_info& ec, AABB *bb, vector(e) != NULL ) isAssignableFrom = true; } - else if ( ec == typeid(Mob) ) { if( dynamic_pointer_cast(e) != NULL ) isAssignableFrom = true; } - else if ( ec == typeid(Monster) ) { if( dynamic_pointer_cast(e) != NULL ) isAssignableFrom = true; } - else if ( ec == typeid(Zombie) ) { if( dynamic_pointer_cast(e) != NULL ) isAssignableFrom = true; } + if( ec == typeid(Player) ) { if( std::dynamic_pointer_cast(e) != NULL ) isAssignableFrom = true; } + else if ( ec == typeid(Mob) ) { if( std::dynamic_pointer_cast(e) != NULL ) isAssignableFrom = true; } + else if ( ec == typeid(Monster) ) { if( std::dynamic_pointer_cast(e) != NULL ) isAssignableFrom = true; } + else if ( ec == typeid(Zombie) ) { if( std::dynamic_pointer_cast(e) != NULL ) isAssignableFrom = true; } else if(e != NULL && ec == typeid(*(e.get())) ) isAssignableFrom = true; if (isAssignableFrom && e->bb->intersects(bb)) es.push_back(e); // 4J - note needs to be equivalent to baseClass.isAssignableFrom(e.getClass()) diff --git a/Minecraft.World/LookAtTradingPlayerGoal.cpp b/Minecraft.World/LookAtTradingPlayerGoal.cpp index db1e25a2..d3c5dd7c 100644 --- a/Minecraft.World/LookAtTradingPlayerGoal.cpp +++ b/Minecraft.World/LookAtTradingPlayerGoal.cpp @@ -12,7 +12,7 @@ bool LookAtTradingPlayerGoal::canUse() { if (villager->isTrading()) { - lookAt = weak_ptr(dynamic_pointer_cast(villager->getTradingPlayer())); + lookAt = weak_ptr(std::dynamic_pointer_cast(villager->getTradingPlayer())); return true; } return false; diff --git a/Minecraft.World/LookControl.cpp b/Minecraft.World/LookControl.cpp index 13783c81..76a3daaa 100644 --- a/Minecraft.World/LookControl.cpp +++ b/Minecraft.World/LookControl.cpp @@ -16,7 +16,7 @@ LookControl::LookControl(Mob *mob) void LookControl::setLookAt(std::shared_ptr target, float yMax, float xMax) { this->wantedX = target->x; - std::shared_ptr targetMob = dynamic_pointer_cast(target); + std::shared_ptr targetMob = std::dynamic_pointer_cast(target); if (targetMob != NULL) this->wantedY = target->y + targetMob->getHeadHeight(); else this->wantedY = (target->bb->y0 + target->bb->y1) / 2; this->wantedZ = target->z; diff --git a/Minecraft.World/MakeLoveGoal.cpp b/Minecraft.World/MakeLoveGoal.cpp index cff6d01e..d560d783 100644 --- a/Minecraft.World/MakeLoveGoal.cpp +++ b/Minecraft.World/MakeLoveGoal.cpp @@ -32,7 +32,7 @@ bool MakeLoveGoal::canUse() std::shared_ptr mate = level->getClosestEntityOfClass(typeid(Villager), villager->bb->grow(8, 3, 8), villager->shared_from_this()); if (mate == NULL) return false; - partner = weak_ptr(dynamic_pointer_cast(mate)); + partner = weak_ptr(std::dynamic_pointer_cast(mate)); if (partner.lock()->getAge() != 0) return false; return true; diff --git a/Minecraft.World/MapItem.cpp b/Minecraft.World/MapItem.cpp index 3f5682ab..b5adb206 100644 --- a/Minecraft.World/MapItem.cpp +++ b/Minecraft.World/MapItem.cpp @@ -22,7 +22,7 @@ MapItem::MapItem(int id) : ComplexItem(id) std::shared_ptr MapItem::getSavedData(short idNum, Level *level) { std::wstring id = wstring( L"map_" ) + _toString(idNum); - std::shared_ptr mapItemSavedData = dynamic_pointer_cast(level->getSavedData(typeid(MapItemSavedData), id)); + std::shared_ptr mapItemSavedData = std::dynamic_pointer_cast(level->getSavedData(typeid(MapItemSavedData), id)); if (mapItemSavedData == NULL) { @@ -45,7 +45,7 @@ std::shared_ptr MapItem::getSavedData(std::shared_ptrgetAuxValue() ); MemSect(0); - std::shared_ptr mapItemSavedData = dynamic_pointer_cast( level->getSavedData(typeid(MapItemSavedData), id ) ); + std::shared_ptr mapItemSavedData = std::dynamic_pointer_cast( level->getSavedData(typeid(MapItemSavedData), id ) ); bool newData = false; if (mapItemSavedData == NULL) @@ -264,9 +264,9 @@ void MapItem::inventoryTick(std::shared_ptr itemInstance, Level *l if (level->isClientSide) return; std::shared_ptr data = getSavedData(itemInstance, level); - if (dynamic_pointer_cast(owner) != NULL) + if (std::dynamic_pointer_cast(owner) != NULL) { - std::shared_ptr player = dynamic_pointer_cast(owner); + std::shared_ptr player = std::dynamic_pointer_cast(owner); // 4J Stu - If the player has a map that belongs to another player, then merge the data over and change this map id to the owners id int ownersAuxValue = level->getAuxValueForMap(player->getXuid(), data->dimension, data->x, data->z, data->scale); diff --git a/Minecraft.World/MapItemSavedData.cpp b/Minecraft.World/MapItemSavedData.cpp index ab6d7819..123540c1 100644 --- a/Minecraft.World/MapItemSavedData.cpp +++ b/Minecraft.World/MapItemSavedData.cpp @@ -125,7 +125,7 @@ charArray MapItemSavedData::HoldingPlayer::nextUpdatePacket(std::shared_ptr servPlayer = dynamic_pointer_cast(player); + std::shared_ptr servPlayer = std::dynamic_pointer_cast(player); for (int d = 0; d < 10; d++) { int column = (tick * 11) % (MapItem::IMAGE_WIDTH); diff --git a/Minecraft.World/MerchantMenu.cpp b/Minecraft.World/MerchantMenu.cpp index 50f9fbdf..6763610b 100644 --- a/Minecraft.World/MerchantMenu.cpp +++ b/Minecraft.World/MerchantMenu.cpp @@ -10,7 +10,7 @@ MerchantMenu::MerchantMenu(std::shared_ptr inventory, std::shared_ptr trader = merchant; this->level = level; - tradeContainer = std::shared_ptr( new MerchantContainer(dynamic_pointer_cast(inventory->player->shared_from_this()), merchant) ); + tradeContainer = std::shared_ptr( new MerchantContainer(std::dynamic_pointer_cast(inventory->player->shared_from_this()), merchant) ); addSlot(new Slot(tradeContainer, PAYMENT1_SLOT, SELLSLOT1_X, ROW2_Y)); addSlot(new Slot(tradeContainer, PAYMENT2_SLOT, SELLSLOT2_X, ROW2_Y)); addSlot(new MerchantResultSlot(inventory->player, merchant, tradeContainer, RESULT_SLOT, BUYSLOT_X, ROW2_Y)); diff --git a/Minecraft.World/MerchantResultSlot.cpp b/Minecraft.World/MerchantResultSlot.cpp index 7617bdf1..661d2dc3 100644 --- a/Minecraft.World/MerchantResultSlot.cpp +++ b/Minecraft.World/MerchantResultSlot.cpp @@ -33,7 +33,7 @@ void MerchantResultSlot::onQuickCraft(std::shared_ptr picked, int void MerchantResultSlot::checkTakeAchievements(std::shared_ptr carried) { - carried->onCraftedBy(player->level, dynamic_pointer_cast(player->shared_from_this()), removeCount); + carried->onCraftedBy(player->level, std::dynamic_pointer_cast(player->shared_from_this()), removeCount); removeCount = 0; } diff --git a/Minecraft.World/MineShaftPieces.cpp b/Minecraft.World/MineShaftPieces.cpp index d6a60ee7..f440507a 100644 --- a/Minecraft.World/MineShaftPieces.cpp +++ b/Minecraft.World/MineShaftPieces.cpp @@ -440,7 +440,7 @@ bool MineShaftPieces::MineShaftCorridor::postProcess(Level *level, Random *rando { hasPlacedSpider = true; level->setTile(x, y, newZ, Tile::mobSpawner_Id); - std::shared_ptr entity = dynamic_pointer_cast( level->getTileEntity(x, y, newZ) ); + std::shared_ptr entity = std::dynamic_pointer_cast( level->getTileEntity(x, y, newZ) ); if (entity != NULL) entity->setEntityId(L"CaveSpider"); } } diff --git a/Minecraft.World/Minecart.cpp b/Minecraft.World/Minecart.cpp index 529629ff..5280eb4f 100644 --- a/Minecraft.World/Minecart.cpp +++ b/Minecraft.World/Minecart.cpp @@ -187,8 +187,8 @@ bool Minecart::hurt(DamageSource *source, int hurtDamage) { std::shared_ptr attacker = source->getDirectEntity(); - if (dynamic_pointer_cast(attacker) != NULL && - !dynamic_pointer_cast(attacker)->isAllowedToHurtEntity( shared_from_this() )) + if (std::dynamic_pointer_cast(attacker) != NULL && + !std::dynamic_pointer_cast(attacker)->isAllowedToHurtEntity( shared_from_this() )) return false; } @@ -202,7 +202,7 @@ bool Minecart::hurt(DamageSource *source, int hurtDamage) if( rider.lock() != NULL && rider.lock() == source->getEntity() ) hurtDamage += 1; // 4J Stu - Brought froward from 12w36 to fix #46611 - TU5: Gameplay: Minecarts and boat requires more hits than one to be destroyed in creative mode - std::shared_ptr player = dynamic_pointer_cast(source->getEntity()); + std::shared_ptr player = std::dynamic_pointer_cast(source->getEntity()); if (player != NULL && player->abilities.instabuild) this->setDamage(100); this->setDamage(getDamage() + (hurtDamage * 10)); @@ -215,7 +215,7 @@ bool Minecart::hurt(DamageSource *source, int hurtDamage) spawnAtLocation(Item::minecart->id, 1, 0); if (type == Minecart::CHEST) { - std::shared_ptr container = dynamic_pointer_cast( shared_from_this() ); + std::shared_ptr container = std::dynamic_pointer_cast( shared_from_this() ); for (unsigned int i = 0; i < container->getContainerSize(); i++) { std::shared_ptr item = container->getItem(i); @@ -678,7 +678,7 @@ void Minecart::tick() std::shared_ptr e = (*it); //entities->at(i); if (e != rider.lock() && e->isPushable() && e->GetType() == eTYPE_MINECART) { - std::shared_ptr cart = dynamic_pointer_cast(e); + std::shared_ptr cart = std::dynamic_pointer_cast(e); cart->m_bHasPushedCartThisTick = false; cart->push(shared_from_this()); @@ -905,7 +905,7 @@ void Minecart::push(std::shared_ptr e) if (level->isClientSide) return; if (e == rider.lock()) return; - if (( dynamic_pointer_cast(e)!=NULL) && dynamic_pointer_cast(e)==NULL && dynamic_pointer_cast(e) == NULL && type == Minecart::RIDEABLE && xd * xd + zd * zd > 0.01) + if (( std::dynamic_pointer_cast(e)!=NULL) && std::dynamic_pointer_cast(e)==NULL && std::dynamic_pointer_cast(e) == NULL && type == Minecart::RIDEABLE && xd * xd + zd * zd > 0.01) { if (rider.lock() == NULL && e->riding == NULL) { @@ -954,7 +954,7 @@ void Minecart::push(std::shared_ptr e) double xdd = (e->xd + xd); double zdd = (e->zd + zd); - std::shared_ptr cart = dynamic_pointer_cast(e); + std::shared_ptr cart = std::dynamic_pointer_cast(e); if (cart != NULL && cart->type == Minecart::FURNACE && type != Minecart::FURNACE) { xd *= 0.2f; @@ -1077,7 +1077,7 @@ bool Minecart::interact(std::shared_ptr player) { if (type == Minecart::RIDEABLE) { - if (rider.lock() != NULL && dynamic_pointer_cast(rider.lock())!=NULL && rider.lock() != player) return true; + if (rider.lock() != NULL && std::dynamic_pointer_cast(rider.lock())!=NULL && rider.lock() != player) return true; if (!level->isClientSide) { // 4J HEG - Fixed issue with player not being able to dismount minecart (issue #4455) @@ -1089,7 +1089,7 @@ bool Minecart::interact(std::shared_ptr player) if ( player->isAllowedToInteract(shared_from_this()) ) { if (!level->isClientSide) - player->openContainer( dynamic_pointer_cast( shared_from_this() ) ); + player->openContainer( std::dynamic_pointer_cast( shared_from_this() ) ); } else { diff --git a/Minecraft.World/Mob.cpp b/Minecraft.World/Mob.cpp index 23f8639e..74fb7c19 100644 --- a/Minecraft.World/Mob.cpp +++ b/Minecraft.World/Mob.cpp @@ -205,7 +205,7 @@ std::shared_ptr Mob::getLastHurtMob() void Mob::setLastHurtMob(std::shared_ptr target) { - std::shared_ptr mob = dynamic_pointer_cast(target); + std::shared_ptr mob = std::dynamic_pointer_cast(target); if (mob != NULL) lastHurtMob = mob; } @@ -661,7 +661,7 @@ bool Mob::hurt(DamageSource *source, int dmg) if ( source->isFire() && hasEffect(MobEffect::fireResistance) ) { // 4J-JEV, for new achievement Stayin'Frosty, TODO merge with Java version. - std::shared_ptr plr = dynamic_pointer_cast(shared_from_this()); + std::shared_ptr plr = std::dynamic_pointer_cast(shared_from_this()); if ( plr != NULL && source == DamageSource::lava ) // Only award when in lava (not any fire). { plr->awardStat(GenericStats::stayinFrosty(),GenericStats::param_stayinFrosty()); @@ -693,18 +693,18 @@ bool Mob::hurt(DamageSource *source, int dmg) std::shared_ptr sourceEntity = source->getEntity(); if (sourceEntity != NULL) { - if (dynamic_pointer_cast(sourceEntity) != NULL) { - setLastHurtByMob(dynamic_pointer_cast(sourceEntity)); + if (std::dynamic_pointer_cast(sourceEntity) != NULL) { + setLastHurtByMob(std::dynamic_pointer_cast(sourceEntity)); } - if (dynamic_pointer_cast(sourceEntity) != NULL) + if (std::dynamic_pointer_cast(sourceEntity) != NULL) { lastHurtByPlayerTime = PLAYER_HURT_EXPERIENCE_TIME; - lastHurtByPlayer = dynamic_pointer_cast(sourceEntity); + lastHurtByPlayer = std::dynamic_pointer_cast(sourceEntity); } - else if (dynamic_pointer_cast(sourceEntity)) + else if (std::dynamic_pointer_cast(sourceEntity)) { - std::shared_ptr w = dynamic_pointer_cast(sourceEntity); + std::shared_ptr w = std::dynamic_pointer_cast(sourceEntity); if (w->isTame()) { lastHurtByPlayerTime = PLAYER_HURT_EXPERIENCE_TIME; @@ -856,14 +856,14 @@ void Mob::die(DamageSource *source) std::shared_ptr sourceEntity = source->getEntity(); if (deathScore >= 0 && sourceEntity != NULL) sourceEntity->awardKillScore(shared_from_this(), deathScore); - if (sourceEntity != NULL) sourceEntity->killed( dynamic_pointer_cast( shared_from_this() ) ); + if (sourceEntity != NULL) sourceEntity->killed( std::dynamic_pointer_cast( shared_from_this() ) ); dead = true; if (!level->isClientSide) { int playerBonus = 0; - std::shared_ptr player = dynamic_pointer_cast(sourceEntity); + std::shared_ptr player = std::dynamic_pointer_cast(sourceEntity); if (player != NULL) { playerBonus = EnchantmentHelper::getKillingLootBonus(player->inventory); @@ -884,7 +884,7 @@ void Mob::die(DamageSource *source) // 4J-JEV, hook for Durango mobKill event. if (player != NULL) { - player->awardStat(GenericStats::killMob(),GenericStats::param_mobKill(player, dynamic_pointer_cast(shared_from_this()), source)); + player->awardStat(GenericStats::killMob(),GenericStats::param_mobKill(player, std::dynamic_pointer_cast(shared_from_this()), source)); } } @@ -953,14 +953,14 @@ void Mob::causeFallDamage(float distance) void Mob::travel(float xa, float ya) { #ifdef __PSVITA__ - // AP - dynamic_pointer_cast is a non-trivial call + // AP - std::dynamic_pointer_cast is a non-trivial call Player *thisPlayer = NULL; if( (GetType() & eTYPE_PLAYER) == eTYPE_PLAYER ) { thisPlayer = (Player*) this; } #else - std::shared_ptr thisPlayer = dynamic_pointer_cast(shared_from_this()); + std::shared_ptr thisPlayer = std::dynamic_pointer_cast(shared_from_this()); #endif if (isInWater() && !(thisPlayer && thisPlayer->abilities.flying) ) { @@ -1038,7 +1038,7 @@ void Mob::travel(float xa, float ya) if (zd > max) zd = max; this->fallDistance = 0; if (yd < -0.15) yd = -0.15; - bool playerSneaking = isSneaking() && dynamic_pointer_cast(shared_from_this()) != NULL; + bool playerSneaking = isSneaking() && std::dynamic_pointer_cast(shared_from_this()) != NULL; if (playerSneaking && yd < 0) yd = 0; } @@ -1455,7 +1455,7 @@ void Mob::lookAt(std::shared_ptr e, float yMax, float xMax) double yd; double zd = e->z - z; - std::shared_ptr mob = dynamic_pointer_cast(e); + std::shared_ptr mob = std::dynamic_pointer_cast(e); if(mob != NULL) { yd = (y + getHeadHeight()) - (mob->y + mob->getHeadHeight()); @@ -1657,7 +1657,7 @@ void Mob::tickEffects() { MobEffectInstance *effect = it->second; removed = false; - if (!effect->tick(dynamic_pointer_cast(shared_from_this()))) + if (!effect->tick(std::dynamic_pointer_cast(shared_from_this()))) { if (!level->isClientSide) { diff --git a/Minecraft.World/MobEffect.cpp b/Minecraft.World/MobEffect.cpp index f9fecc18..8d82a633 100644 --- a/Minecraft.World/MobEffect.cpp +++ b/Minecraft.World/MobEffect.cpp @@ -104,11 +104,11 @@ void MobEffect::applyEffectTick(std::shared_ptr mob, int amplification) mob->hurt(DamageSource::magic, 1); } } - else if (id == hunger->id && dynamic_pointer_cast(mob) != NULL) + else if (id == hunger->id && std::dynamic_pointer_cast(mob) != NULL) { // every tick, cause the same amount of exhaustion as when removing // a block, times amplification - dynamic_pointer_cast(mob)->causeFoodExhaustion(FoodConstants::EXHAUSTION_MINE * (amplification + 1)); + std::dynamic_pointer_cast(mob)->causeFoodExhaustion(FoodConstants::EXHAUSTION_MINE * (amplification + 1)); } else if ((id == heal->id && !mob->isInvertedHealAndHarm()) || (id == harm->id && mob->isInvertedHealAndHarm())) { diff --git a/Minecraft.World/MobSpawner.cpp b/Minecraft.World/MobSpawner.cpp index f89ac395..e366aaaa 100644 --- a/Minecraft.World/MobSpawner.cpp +++ b/Minecraft.World/MobSpawner.cpp @@ -294,7 +294,7 @@ const int MobSpawner::tick(ServerLevel *level, bool spawnEnemies, bool spawnFrie // { MemSect(29); //mob = type.mobClass.getConstructor(Level.class).newInstance(level); - mob = dynamic_pointer_cast(EntityIO::newByEnumType(currentMobType->mobClass, level)); + mob = std::dynamic_pointer_cast(EntityIO::newByEnumType(currentMobType->mobClass, level)); MemSect(0); // } // catch (exception e) @@ -425,18 +425,18 @@ bool MobSpawner::isSpawnPositionOk(MobCategory *category, Level *level, int x, i void MobSpawner::finalizeMobSettings(std::shared_ptr mob, Level *level, float xx, float yy, float zz) { - if (dynamic_pointer_cast( mob ) != NULL && level->random->nextInt(100) == 0) + if (std::dynamic_pointer_cast( mob ) != NULL && level->random->nextInt(100) == 0) { std::shared_ptr skeleton = std::shared_ptr( new Skeleton(level) ); skeleton->moveTo(xx, yy, zz, mob->yRot, 0); level->addEntity(skeleton); skeleton->ride(mob); } - else if (dynamic_pointer_cast( mob ) != NULL) + else if (std::dynamic_pointer_cast( mob ) != NULL) { - (dynamic_pointer_cast( mob ))->setColor(Sheep::getSheepColor(level->random)); + (std::dynamic_pointer_cast( mob ))->setColor(Sheep::getSheepColor(level->random)); } - else if (dynamic_pointer_cast( mob ) != NULL) + else if (std::dynamic_pointer_cast( mob ) != NULL) { if (level->random->nextInt(7) == 0) { @@ -520,7 +520,7 @@ bool MobSpawner::attackSleepingPlayers(Level *level, vector(EntityIO::newByEnumType(bedEnemies[type], level )); + mob = std::dynamic_pointer_cast(EntityIO::newByEnumType(bedEnemies[type], level )); // } // catch (exception e) // { @@ -621,7 +621,7 @@ void MobSpawner::postProcessSpawnMobs(Level *level, Biome *biome, int xo, int zo std::shared_ptr mob; //try { - mob = dynamic_pointer_cast( EntityIO::newByEnumType(type->mobClass, level ) ); + mob = std::dynamic_pointer_cast( EntityIO::newByEnumType(type->mobClass, level ) ); //} catch (Exception e) { // e.printStackTrace(); // continue; diff --git a/Minecraft.World/MobSpawnerTileEntity.cpp b/Minecraft.World/MobSpawnerTileEntity.cpp index 31240a40..0caddf3c 100644 --- a/Minecraft.World/MobSpawnerTileEntity.cpp +++ b/Minecraft.World/MobSpawnerTileEntity.cpp @@ -89,7 +89,7 @@ void MobSpawnerTileEntity::tick() for (int c = 0; c < spawnCount; c++) { - std::shared_ptr entity = dynamic_pointer_cast (EntityIO::newEntity(entityId, level)); + std::shared_ptr entity = std::dynamic_pointer_cast (EntityIO::newEntity(entityId, level)); if (entity == NULL) return; vector > *vecNearby = level->getEntitiesOfClass(typeid(*entity), AABB::newTemp(x, y, z, x + 1, y + 1, z + 1)->grow(8, 4, 8)); @@ -115,7 +115,7 @@ void MobSpawnerTileEntity::tick() double xp = x + (level->random->nextDouble() - level->random->nextDouble()) * 4; double yp = y + level->random->nextInt(3) - 1; double zp = z + (level->random->nextDouble() - level->random->nextDouble()) * 4; - std::shared_ptr mob = dynamic_pointer_cast( entity ); + std::shared_ptr mob = std::dynamic_pointer_cast( entity ); entity->moveTo(xp, yp, zp, level->random->nextFloat() * 360, 0); diff --git a/Minecraft.World/Monster.cpp b/Minecraft.World/Monster.cpp index 1ec418ae..d93e73f4 100644 --- a/Minecraft.World/Monster.cpp +++ b/Minecraft.World/Monster.cpp @@ -95,19 +95,19 @@ bool Monster::doHurtTarget(std::shared_ptr target) dmg -= (2 << getEffect(MobEffect::weakness)->getAmplifier()); } - DamageSource *damageSource = DamageSource::mobAttack(dynamic_pointer_cast( shared_from_this() ) ); + DamageSource *damageSource = DamageSource::mobAttack(std::dynamic_pointer_cast( shared_from_this() ) ); bool didHurt = target->hurt(damageSource, dmg); delete damageSource; if (didHurt) { - int fireAspect = EnchantmentHelper::getFireAspect(dynamic_pointer_cast(shared_from_this())); + int fireAspect = EnchantmentHelper::getFireAspect(std::dynamic_pointer_cast(shared_from_this())); if (fireAspect > 0) { target->setOnFire(fireAspect * 4); } - std::shared_ptr mob = dynamic_pointer_cast(target); + std::shared_ptr mob = std::dynamic_pointer_cast(target); if (mob != NULL) { ThornsEnchantment::doThornsAfterAttack(shared_from_this(), mob, random); diff --git a/Minecraft.World/MonsterPlacerItem.cpp b/Minecraft.World/MonsterPlacerItem.cpp index 3c7809fe..89d79346 100644 --- a/Minecraft.World/MonsterPlacerItem.cpp +++ b/Minecraft.World/MonsterPlacerItem.cpp @@ -181,7 +181,7 @@ bool MonsterPlacerItem::useOn(std::shared_ptr itemInstance, std::s // 4J Stu - Force adding this as a tile update level->setTile(x,y,z,0); level->setTile(x,y,z,Tile::mobSpawner_Id); - std::shared_ptr mste = dynamic_pointer_cast( level->getTileEntity(x,y,z) ); + std::shared_ptr mste = std::dynamic_pointer_cast( level->getTileEntity(x,y,z) ); if(mste != NULL) { mste->setEntityId( EntityIO::getEncodeId(itemInstance->getAuxValue()) ); @@ -267,7 +267,7 @@ std::shared_ptr MonsterPlacerItem::spawnMobAt(Level *level, int mobId, d { newEntity = canSpawn(mobId, level, piResult); - std::shared_ptr mob = dynamic_pointer_cast(newEntity); + std::shared_ptr mob = std::dynamic_pointer_cast(newEntity); if (mob) { newEntity->moveTo(x, y, z, Mth::wrapDegrees(level->random->nextFloat() * 360), 0); diff --git a/Minecraft.World/MonsterRoomFeature.cpp b/Minecraft.World/MonsterRoomFeature.cpp index cd8e4d53..f9445b41 100644 --- a/Minecraft.World/MonsterRoomFeature.cpp +++ b/Minecraft.World/MonsterRoomFeature.cpp @@ -84,7 +84,7 @@ bool MonsterRoomFeature::place(Level *level, Random *random, int x, int y, int z if (count != 1) continue; level->setTile(xc, yc, zc, Tile::chest_Id); - std::shared_ptr chest = dynamic_pointer_cast( level->getTileEntity(xc, yc, zc) ); + std::shared_ptr chest = std::dynamic_pointer_cast( level->getTileEntity(xc, yc, zc) ); if (chest != NULL ) { for (int j = 0; j < 8; j++) @@ -100,7 +100,7 @@ bool MonsterRoomFeature::place(Level *level, Random *random, int x, int y, int z level->setTile(x, y, z, Tile::mobSpawner_Id); - std::shared_ptr entity = dynamic_pointer_cast( level->getTileEntity(x, y, z) ); + std::shared_ptr entity = std::dynamic_pointer_cast( level->getTileEntity(x, y, z) ); if( entity != NULL ) { entity->setEntityId(randomEntityId(random)); diff --git a/Minecraft.World/MoveEntityPacket.cpp b/Minecraft.World/MoveEntityPacket.cpp index ce33c019..7783a8b8 100644 --- a/Minecraft.World/MoveEntityPacket.cpp +++ b/Minecraft.World/MoveEntityPacket.cpp @@ -60,7 +60,7 @@ bool MoveEntityPacket::canBeInvalidated() bool MoveEntityPacket::isInvalidatedBy(std::shared_ptr packet) { - std::shared_ptr target = dynamic_pointer_cast(packet); + std::shared_ptr target = std::dynamic_pointer_cast(packet); return target != NULL && target->id == id; } diff --git a/Minecraft.World/MoveEntityPacketSmall.cpp b/Minecraft.World/MoveEntityPacketSmall.cpp index 8a46537f..af3673dd 100644 --- a/Minecraft.World/MoveEntityPacketSmall.cpp +++ b/Minecraft.World/MoveEntityPacketSmall.cpp @@ -67,7 +67,7 @@ bool MoveEntityPacketSmall::canBeInvalidated() bool MoveEntityPacketSmall::isInvalidatedBy(std::shared_ptr packet) { - std::shared_ptr target = dynamic_pointer_cast(packet); + std::shared_ptr target = std::dynamic_pointer_cast(packet); return target != NULL && target->id == id; } diff --git a/Minecraft.World/MoveIndoorsGoal.cpp b/Minecraft.World/MoveIndoorsGoal.cpp index 697b2840..11e6f86d 100644 --- a/Minecraft.World/MoveIndoorsGoal.cpp +++ b/Minecraft.World/MoveIndoorsGoal.cpp @@ -44,7 +44,7 @@ void MoveIndoorsGoal::start() } if (mob->distanceToSqr(_doorInfo->getIndoorX(), _doorInfo->y, _doorInfo->getIndoorZ()) > 16 * 16) { - Vec3 *pos = RandomPos::getPosTowards(dynamic_pointer_cast(mob->shared_from_this()), 14, 3, Vec3::newTemp(_doorInfo->getIndoorX() + 0.5, _doorInfo->getIndoorY(), _doorInfo->getIndoorZ() + 0.5)); + Vec3 *pos = RandomPos::getPosTowards(std::dynamic_pointer_cast(mob->shared_from_this()), 14, 3, Vec3::newTemp(_doorInfo->getIndoorX() + 0.5, _doorInfo->getIndoorY(), _doorInfo->getIndoorZ() + 0.5)); if (pos != NULL) mob->getNavigation()->moveTo(pos->x, pos->y, pos->z, 0.3f); } else mob->getNavigation()->moveTo(_doorInfo->getIndoorX() + 0.5, _doorInfo->getIndoorY(), _doorInfo->getIndoorZ() + 0.5, 0.3f); diff --git a/Minecraft.World/MoveThroughVillageGoal.cpp b/Minecraft.World/MoveThroughVillageGoal.cpp index 40acca5d..39f82f10 100644 --- a/Minecraft.World/MoveThroughVillageGoal.cpp +++ b/Minecraft.World/MoveThroughVillageGoal.cpp @@ -46,7 +46,7 @@ bool MoveThroughVillageGoal::canUse() mob->getNavigation()->setCanOpenDoors(oldCanOpenDoors); if (path != NULL) return true; - Vec3 *pos = RandomPos::getPosTowards(dynamic_pointer_cast(mob->shared_from_this()), 10, 7, Vec3::newTemp(_doorInfo->x, _doorInfo->y, _doorInfo->z)); + Vec3 *pos = RandomPos::getPosTowards(std::dynamic_pointer_cast(mob->shared_from_this()), 10, 7, Vec3::newTemp(_doorInfo->x, _doorInfo->y, _doorInfo->z)); if (pos == NULL) return false; mob->getNavigation()->setCanOpenDoors(false); delete path; diff --git a/Minecraft.World/MoveTowardsRestrictionGoal.cpp b/Minecraft.World/MoveTowardsRestrictionGoal.cpp index a1848d46..5b456d30 100644 --- a/Minecraft.World/MoveTowardsRestrictionGoal.cpp +++ b/Minecraft.World/MoveTowardsRestrictionGoal.cpp @@ -19,7 +19,7 @@ bool MoveTowardsRestrictionGoal::canUse() { if (mob->isWithinRestriction()) return false; Pos *towards = mob->getRestrictCenter(); - Vec3 *pos = RandomPos::getPosTowards(dynamic_pointer_cast(mob->shared_from_this()), 16, 7, Vec3::newTemp(towards->x, towards->y, towards->z)); + Vec3 *pos = RandomPos::getPosTowards(std::dynamic_pointer_cast(mob->shared_from_this()), 16, 7, Vec3::newTemp(towards->x, towards->y, towards->z)); if (pos == NULL) return false; wantedX = pos->x; wantedY = pos->y; diff --git a/Minecraft.World/MoveTowardsTargetGoal.cpp b/Minecraft.World/MoveTowardsTargetGoal.cpp index 6d9810b5..38d5e1c2 100644 --- a/Minecraft.World/MoveTowardsTargetGoal.cpp +++ b/Minecraft.World/MoveTowardsTargetGoal.cpp @@ -19,7 +19,7 @@ bool MoveTowardsTargetGoal::canUse() target = weak_ptr(mob->getTarget()); if (target.lock() == NULL) return false; if (target.lock()->distanceToSqr(mob->shared_from_this()) > within * within) return false; - Vec3 *pos = RandomPos::getPosTowards(dynamic_pointer_cast(mob->shared_from_this()), 16, 7, Vec3::newTemp(target.lock()->x, target.lock()->y, target.lock()->z)); + Vec3 *pos = RandomPos::getPosTowards(std::dynamic_pointer_cast(mob->shared_from_this()), 16, 7, Vec3::newTemp(target.lock()->x, target.lock()->y, target.lock()->z)); if (pos == NULL) return false; wantedX = pos->x; wantedY = pos->y; diff --git a/Minecraft.World/MusicTile.cpp b/Minecraft.World/MusicTile.cpp index fe8503e2..b6c09d48 100644 --- a/Minecraft.World/MusicTile.cpp +++ b/Minecraft.World/MusicTile.cpp @@ -12,7 +12,7 @@ void MusicTile::neighborChanged(Level *level, int x, int y, int z, int type) { app.DebugPrintf("-------- Neighbour changed type %d\n", type); bool signal = level->hasNeighborSignal(x, y, z); - std::shared_ptr mte = dynamic_pointer_cast( level->getTileEntity(x, y, z) ); + std::shared_ptr mte = std::dynamic_pointer_cast( level->getTileEntity(x, y, z) ); app.DebugPrintf("-------- Signal is %s, tile is currently %s\n",signal?"TRUE":"FALSE", mte->on?"ON":"OFF"); if (mte != NULL && mte->on != signal) { @@ -34,7 +34,7 @@ bool MusicTile::use(Level *level, int x, int y, int z, std::shared_ptr p { if (soundOnly) return false; if (level->isClientSide) return true; - std::shared_ptr mte = dynamic_pointer_cast( level->getTileEntity(x, y, z) ); + std::shared_ptr mte = std::dynamic_pointer_cast( level->getTileEntity(x, y, z) ); if (mte != NULL ) { mte->tune(); @@ -46,7 +46,7 @@ bool MusicTile::use(Level *level, int x, int y, int z, std::shared_ptr p void MusicTile::attack(Level *level, int x, int y, int z, std::shared_ptr player) { if (level->isClientSide) return; - std::shared_ptr mte = dynamic_pointer_cast( level->getTileEntity(x, y, z) ); + std::shared_ptr mte = std::dynamic_pointer_cast( level->getTileEntity(x, y, z) ); if( mte != NULL ) mte->playNote(level, x, y, z); } diff --git a/Minecraft.World/NearestAttackableTargetGoal.cpp b/Minecraft.World/NearestAttackableTargetGoal.cpp index 23bf8d0b..5d9525aa 100644 --- a/Minecraft.World/NearestAttackableTargetGoal.cpp +++ b/Minecraft.World/NearestAttackableTargetGoal.cpp @@ -52,7 +52,7 @@ bool NearestAttackableTargetGoal::canUse() std::sort(entities->begin(), entities->end(), *distComp); for(AUTO_VAR(it, entities->begin()); it != entities->end(); ++it) { - std::shared_ptr potTarget = dynamic_pointer_cast(*it); + std::shared_ptr potTarget = std::dynamic_pointer_cast(*it); if (canAttack(potTarget, false)) { target = weak_ptr(potTarget); diff --git a/Minecraft.World/NetherBridgePieces.cpp b/Minecraft.World/NetherBridgePieces.cpp index d643904b..1f4acc00 100644 --- a/Minecraft.World/NetherBridgePieces.cpp +++ b/Minecraft.World/NetherBridgePieces.cpp @@ -757,7 +757,7 @@ bool NetherBridgePieces::MonsterThrone::postProcess(Level *level, Random *random { hasPlacedMobSpawner = true; level->setTile(x, y, z, Tile::mobSpawner_Id); - std::shared_ptr entity = dynamic_pointer_cast( level->getTileEntity(x, y, z) ); + std::shared_ptr entity = std::dynamic_pointer_cast( level->getTileEntity(x, y, z) ); if (entity != NULL) entity->setEntityId(L"Blaze"); } } diff --git a/Minecraft.World/OcelotSitOnTileGoal.cpp b/Minecraft.World/OcelotSitOnTileGoal.cpp index 0d0af7de..a485bb39 100644 --- a/Minecraft.World/OcelotSitOnTileGoal.cpp +++ b/Minecraft.World/OcelotSitOnTileGoal.cpp @@ -107,7 +107,7 @@ bool OcelotSitOnTileGoal::isValidTarget(Level *level, int x, int y, int z) if (tile == Tile::chest_Id) { - std::shared_ptr chest = dynamic_pointer_cast(level->getTileEntity(x, y, z)); + std::shared_ptr chest = std::dynamic_pointer_cast(level->getTileEntity(x, y, z)); if (chest->openCount < 1) { diff --git a/Minecraft.World/OfferFlowerGoal.cpp b/Minecraft.World/OfferFlowerGoal.cpp index b604ea84..17e26b00 100644 --- a/Minecraft.World/OfferFlowerGoal.cpp +++ b/Minecraft.World/OfferFlowerGoal.cpp @@ -16,7 +16,7 @@ bool OfferFlowerGoal::canUse() { if (!golem->level->isDay()) return false; if (golem->getRandom()->nextInt(8000) != 0) return false; - villager = weak_ptr(dynamic_pointer_cast( golem->level->getClosestEntityOfClass(typeid(Villager), golem->bb->grow(6, 2, 6), golem->shared_from_this()) )); + villager = weak_ptr(std::dynamic_pointer_cast( golem->level->getClosestEntityOfClass(typeid(Villager), golem->bb->grow(6, 2, 6), golem->shared_from_this()) )); return villager.lock() != NULL; } diff --git a/Minecraft.World/Ozelot.cpp b/Minecraft.World/Ozelot.cpp index e43705ec..af84e8c4 100644 --- a/Minecraft.World/Ozelot.cpp +++ b/Minecraft.World/Ozelot.cpp @@ -186,7 +186,7 @@ int Ozelot::getDeathLoot() bool Ozelot::doHurtTarget(std::shared_ptr target) { - return target->hurt(DamageSource::mobAttack(dynamic_pointer_cast(shared_from_this())), 3); + return target->hurt(DamageSource::mobAttack(std::dynamic_pointer_cast(shared_from_this())), 3); } bool Ozelot::hurt(DamageSource *source, int dmg) @@ -280,7 +280,7 @@ bool Ozelot::canMate(std::shared_ptr animal) if (animal == shared_from_this()) return false; if (!isTame()) return false; - std::shared_ptr partner = dynamic_pointer_cast(animal); + std::shared_ptr partner = std::dynamic_pointer_cast(animal); if (partner == NULL) return false; if (!partner->isTame()) return false; diff --git a/Minecraft.World/PanicGoal.cpp b/Minecraft.World/PanicGoal.cpp index da951ca2..c9c14d6e 100644 --- a/Minecraft.World/PanicGoal.cpp +++ b/Minecraft.World/PanicGoal.cpp @@ -16,7 +16,7 @@ PanicGoal::PanicGoal(PathfinderMob *mob, float speed) bool PanicGoal::canUse() { if (mob->getLastHurtByMob() == NULL) return false; - Vec3 *pos = RandomPos::getPos(dynamic_pointer_cast(mob->shared_from_this()), 5, 4); + Vec3 *pos = RandomPos::getPos(std::dynamic_pointer_cast(mob->shared_from_this()), 5, 4); if (pos == NULL) return false; posX = pos->x; posY = pos->y; diff --git a/Minecraft.World/Pig.cpp b/Minecraft.World/Pig.cpp index 21086365..5f8799b7 100644 --- a/Minecraft.World/Pig.cpp +++ b/Minecraft.World/Pig.cpp @@ -56,7 +56,7 @@ int Pig::getMaxHealth() bool Pig::canBeControlledByRider() { - std::shared_ptr item = dynamic_pointer_cast(rider.lock())->getCarriedItem(); + std::shared_ptr item = std::dynamic_pointer_cast(rider.lock())->getCarriedItem(); return item != NULL && item->id == Item::carrotOnAStick_Id; } @@ -162,9 +162,9 @@ void Pig::thunderHit(const LightningBolt *lightningBolt) void Pig::causeFallDamage(float distance) { Animal::causeFallDamage(distance); - if (distance > 5 && dynamic_pointer_cast( rider.lock() ) != NULL) + if (distance > 5 && std::dynamic_pointer_cast( rider.lock() ) != NULL) { - (dynamic_pointer_cast(rider.lock()))->awardStat(GenericStats::flyPig(),GenericStats::param_flyPig()); + (std::dynamic_pointer_cast(rider.lock()))->awardStat(GenericStats::flyPig(),GenericStats::param_flyPig()); } } diff --git a/Minecraft.World/PigZombie.cpp b/Minecraft.World/PigZombie.cpp index 35da6eb9..ca81b874 100644 --- a/Minecraft.World/PigZombie.cpp +++ b/Minecraft.World/PigZombie.cpp @@ -104,16 +104,16 @@ std::shared_ptr PigZombie::findAttackTarget() bool PigZombie::hurt(DamageSource *source, int dmg) { std::shared_ptr sourceEntity = source->getEntity(); - if (dynamic_pointer_cast(sourceEntity) != NULL) + if (std::dynamic_pointer_cast(sourceEntity) != NULL) { 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); - if (dynamic_pointer_cast(e) != NULL) + if (std::dynamic_pointer_cast(e) != NULL) { - std::shared_ptr pigZombie = dynamic_pointer_cast(e); + std::shared_ptr pigZombie = std::dynamic_pointer_cast(e); pigZombie->alert(sourceEntity); } } diff --git a/Minecraft.World/PistonBaseTile.cpp b/Minecraft.World/PistonBaseTile.cpp index ab8199c3..5ad3a954 100644 --- a/Minecraft.World/PistonBaseTile.cpp +++ b/Minecraft.World/PistonBaseTile.cpp @@ -126,7 +126,7 @@ bool PistonBaseTile::use(Level *level, int x, int y, int z, std::shared_ptr by) { - int targetData = getNewFacing(level, x, y, z, dynamic_pointer_cast(by) ); + int targetData = getNewFacing(level, x, y, z, std::dynamic_pointer_cast(by) ); level->setData(x, y, z, targetData); if (!level->isClientSide && !ignoreUpdate()) { @@ -250,9 +250,9 @@ void PistonBaseTile::triggerEvent(Level *level, int x, int y, int z, int param1, { PIXBeginNamedEvent(0,"Contract phase A\n"); std::shared_ptr prevTileEntity = level->getTileEntity(x + Facing::STEP_X[facing], y + Facing::STEP_Y[facing], z + Facing::STEP_Z[facing]); - if (prevTileEntity != NULL && dynamic_pointer_cast(prevTileEntity) != NULL) + if (prevTileEntity != NULL && std::dynamic_pointer_cast(prevTileEntity) != NULL) { - dynamic_pointer_cast(prevTileEntity)->finalTick(); + std::dynamic_pointer_cast(prevTileEntity)->finalTick(); } stopSharingIfServer(level, x, y, z); // 4J added @@ -281,9 +281,9 @@ void PistonBaseTile::triggerEvent(Level *level, int x, int y, int z, int param1, // so replace it with the real data, since it's probably // this piston which is changing too fast std::shared_ptr tileEntity = level->getTileEntity(twoX, twoY, twoZ); - if (tileEntity != NULL && dynamic_pointer_cast(tileEntity) != NULL ) + if (tileEntity != NULL && std::dynamic_pointer_cast(tileEntity) != NULL ) { - std::shared_ptr ppe = dynamic_pointer_cast(tileEntity); + std::shared_ptr ppe = std::dynamic_pointer_cast(tileEntity); if (ppe->getFacing() == facing && ppe->isExtending()) { diff --git a/Minecraft.World/PistonMovingPiece.cpp b/Minecraft.World/PistonMovingPiece.cpp index a9d661ee..d1b85822 100644 --- a/Minecraft.World/PistonMovingPiece.cpp +++ b/Minecraft.World/PistonMovingPiece.cpp @@ -23,9 +23,9 @@ void PistonMovingPiece::onPlace(Level *level, int x, int y, int z) void PistonMovingPiece::onRemove(Level *level, int x, int y, int z, int id, int data) { std::shared_ptr tileEntity = level->getTileEntity(x, y, z); - if (tileEntity != NULL && dynamic_pointer_cast(tileEntity) != NULL) + if (tileEntity != NULL && std::dynamic_pointer_cast(tileEntity) != NULL) { - dynamic_pointer_cast(tileEntity)->finalTick(); + std::dynamic_pointer_cast(tileEntity)->finalTick(); } else { @@ -120,7 +120,7 @@ AABB *PistonMovingPiece::getAABB(Level *level, int x, int y, int z) void PistonMovingPiece::updateShape(LevelSource *level, int x, int y, int z, int forceData, std::shared_ptr forceEntity) // 4J added forceData, forceEntity param { - std::shared_ptr entity = dynamic_pointer_cast(forceEntity); + std::shared_ptr entity = std::dynamic_pointer_cast(forceEntity); if( entity == NULL ) entity = getEntity(level, x, y, z); if (entity != NULL) { @@ -191,9 +191,9 @@ AABB *PistonMovingPiece::getAABB(Level *level, int x, int y, int z, int tile, fl std::shared_ptr PistonMovingPiece::getEntity(LevelSource *level, int x, int y, int z) { std::shared_ptr tileEntity = level->getTileEntity(x, y, z); - if (tileEntity != NULL && dynamic_pointer_cast(tileEntity) != NULL) + if (tileEntity != NULL && std::dynamic_pointer_cast(tileEntity) != NULL) { - return dynamic_pointer_cast(tileEntity); + return std::dynamic_pointer_cast(tileEntity); } return nullptr; } diff --git a/Minecraft.World/PlayGoal.cpp b/Minecraft.World/PlayGoal.cpp index 07b94ff9..bbfa65d8 100644 --- a/Minecraft.World/PlayGoal.cpp +++ b/Minecraft.World/PlayGoal.cpp @@ -32,7 +32,7 @@ bool PlayGoal::canUse() { std::shared_ptr c = *it; if (c.get() == mob) continue; - std::shared_ptr friendV = dynamic_pointer_cast(c); + std::shared_ptr friendV = std::dynamic_pointer_cast(c); if (friendV->isChasing()) continue; if (friendV->getAge() >= 0) continue; double distSqr = friendV->distanceToSqr(mob->shared_from_this()); @@ -44,7 +44,7 @@ bool PlayGoal::canUse() if (followFriend.lock() == NULL) { - Vec3 *pos = RandomPos::getPos(dynamic_pointer_cast(mob->shared_from_this()), 16, 3); + Vec3 *pos = RandomPos::getPos(std::dynamic_pointer_cast(mob->shared_from_this()), 16, 3); if (pos == NULL) return false; } return true; @@ -78,7 +78,7 @@ void PlayGoal::tick() { if (mob->getNavigation()->isDone()) { - Vec3 *pos = RandomPos::getPos(dynamic_pointer_cast(mob->shared_from_this()), 16, 3); + Vec3 *pos = RandomPos::getPos(std::dynamic_pointer_cast(mob->shared_from_this()), 16, 3); if (pos == NULL) return; mob->getNavigation()->moveTo(pos->x, pos->y, pos->z, speed); } diff --git a/Minecraft.World/Player.cpp b/Minecraft.World/Player.cpp index 25aeceb8..ef982c22 100644 --- a/Minecraft.World/Player.cpp +++ b/Minecraft.World/Player.cpp @@ -214,7 +214,7 @@ void Player::releaseUsingItem() { if (useItem != NULL) { - useItem->releaseUsing(level, dynamic_pointer_cast( shared_from_this() ), useItemDuration); + useItem->releaseUsing(level, std::dynamic_pointer_cast( shared_from_this() ), useItemDuration); // 4J Stu - Fix for various bugs where an incorrect bow was displayed when it broke (#70859,#93972,#93974) if (useItem->count == 0) @@ -312,7 +312,7 @@ void Player::tick() if (!level->isClientSide) { - if (containerMenu != NULL && !containerMenu->stillValid( dynamic_pointer_cast( shared_from_this() ) )) + if (containerMenu != NULL && !containerMenu->stillValid( std::dynamic_pointer_cast( shared_from_this() ) )) { closeContainer(); containerMenu = inventoryMenu; @@ -355,7 +355,7 @@ void Player::tick() if (!level->isClientSide) { - foodData.tick(dynamic_pointer_cast(shared_from_this())); + foodData.tick(std::dynamic_pointer_cast(shared_from_this())); } // 4J Stu Debugging @@ -411,29 +411,29 @@ void Player::tick() //this->drop( std::shared_ptr( new ItemInstance( Tile::fence, 64 ) ) ); - //std::shared_ptr mob = dynamic_pointer_cast(Pig::_class->newInstance( level )); + //std::shared_ptr mob = std::dynamic_pointer_cast(Pig::_class->newInstance( level )); //mob->moveTo(x+1, y, z+1, level->random->nextFloat() * 360, 0); //level->addEntity(mob); // 4J : WESTY : Spawn some wolves to befriend! /* - std::shared_ptr mob1 = dynamic_pointer_cast(Wolf::_class->newInstance( level )); + std::shared_ptr mob1 = std::dynamic_pointer_cast(Wolf::_class->newInstance( level )); mob1->moveTo(x+1, y, z+1, level->random->nextFloat() * 360, 0); level->addEntity(mob1); - std::shared_ptr mob2 = dynamic_pointer_cast(Wolf::_class->newInstance( level )); + std::shared_ptr mob2 = std::dynamic_pointer_cast(Wolf::_class->newInstance( level )); mob2->moveTo(x+2, y, z+1, level->random->nextFloat() * 360, 0); level->addEntity(mob2); - std::shared_ptr mob3 = dynamic_pointer_cast(Wolf::_class->newInstance( level )); + std::shared_ptr mob3 = std::dynamic_pointer_cast(Wolf::_class->newInstance( level )); mob3->moveTo(x+1, y, z+2, level->random->nextFloat() * 360, 0); level->addEntity(mob3); - std::shared_ptr mob4 = dynamic_pointer_cast(Wolf::_class->newInstance( level )); + std::shared_ptr mob4 = std::dynamic_pointer_cast(Wolf::_class->newInstance( level )); mob4->moveTo(x+3, y, z+1, level->random->nextFloat() * 360, 0); level->addEntity(mob4); - std::shared_ptr mob5 = dynamic_pointer_cast(Wolf::_class->newInstance( level )); + std::shared_ptr mob5 = std::dynamic_pointer_cast(Wolf::_class->newInstance( level )); mob5->moveTo(x+1, y, z+3, level->random->nextFloat() * 360, 0); level->addEntity(mob5); */ @@ -558,7 +558,7 @@ void Player::completeUsingItem() spawnEatParticles(useItem, 16); int oldCount = useItem->count; - std::shared_ptr itemInstance = useItem->useTimeDepleted(level, dynamic_pointer_cast(shared_from_this())); + std::shared_ptr itemInstance = useItem->useTimeDepleted(level, std::dynamic_pointer_cast(shared_from_this())); if (itemInstance != useItem || (itemInstance != NULL && itemInstance->count != oldCount)) { inventory->items[inventory->selected] = itemInstance; @@ -943,7 +943,7 @@ void Player::rideTick() //xRot = preXRot; //yRot = preYRot; - std::shared_ptr pig = dynamic_pointer_cast(riding); + std::shared_ptr pig = std::dynamic_pointer_cast(riding); yBodyRot = pig->yBodyRot; while (yBodyRot - yBodyRotO < -180) @@ -1056,7 +1056,7 @@ void Player::aiStep() void Player::touch(std::shared_ptr entity) { - entity->playerTouch( dynamic_pointer_cast( shared_from_this() ) ); + entity->playerTouch( std::dynamic_pointer_cast( shared_from_this() ) ); } // 4J - Removed 1.0.1 @@ -1350,17 +1350,17 @@ bool Player::hurt(DamageSource *source, int dmg) if (dmg == 0) return false; std::shared_ptr attacker = source->getEntity(); - if ( dynamic_pointer_cast( attacker ) != NULL ) + if ( std::dynamic_pointer_cast( attacker ) != NULL ) { - if ((dynamic_pointer_cast(attacker))->owner != NULL) + if ((std::dynamic_pointer_cast(attacker))->owner != NULL) { - attacker = (dynamic_pointer_cast(attacker))->owner; + attacker = (std::dynamic_pointer_cast(attacker))->owner; } } - if ( dynamic_pointer_cast( attacker ) != NULL ) + if ( std::dynamic_pointer_cast( attacker ) != NULL ) { // aggreviate all pet wolves nearby - directAllTameWolvesOnTarget(dynamic_pointer_cast(attacker), false); + directAllTameWolvesOnTarget(std::dynamic_pointer_cast(attacker), false); } return this->Mob::hurt(source, dmg); @@ -1399,20 +1399,20 @@ void Player::directAllTameWolvesOnTarget(std::shared_ptr target, bool skipS { // filter un-attackable mobs - if ((dynamic_pointer_cast( target ) != NULL) || (dynamic_pointer_cast( target) != NULL)) + if ((std::dynamic_pointer_cast( target ) != NULL) || (std::dynamic_pointer_cast( target) != NULL)) { return; } // never target wolves that has this player as owner - if (dynamic_pointer_cast(target) != NULL) + if (std::dynamic_pointer_cast(target) != NULL) { - std::shared_ptr wolfTarget = dynamic_pointer_cast(target); + std::shared_ptr wolfTarget = std::dynamic_pointer_cast(target); if (wolfTarget->isTame() && m_UUID.compare( wolfTarget->getOwnerUUID() ) == 0 ) { return; } } - if ((dynamic_pointer_cast( target ) != NULL) && !isPlayerVersusPlayer()) + if ((std::dynamic_pointer_cast( target ) != NULL) && !isPlayerVersusPlayer()) { // pvp is off return; @@ -1424,7 +1424,7 @@ void Player::directAllTameWolvesOnTarget(std::shared_ptr target, bool skipS AUTO_VAR(itEnd, nearbyWolves->end()); for (AUTO_VAR(it, nearbyWolves->begin()); it != itEnd; it++) { - std::shared_ptr wolf = dynamic_pointer_cast(*it);; + std::shared_ptr wolf = std::dynamic_pointer_cast(*it);; if (wolf->isTame() && wolf->getAttackTarget() == NULL && m_UUID.compare( wolf->getOwnerUUID() ) == 0) { if (!skipSitting || !wolf->isSitting()) @@ -1509,15 +1509,15 @@ void Player::openItemInstanceGui(std::shared_ptr itemInstance) bool Player::interact(std::shared_ptr entity) { - if (entity->interact( dynamic_pointer_cast( shared_from_this() ) )) return true; + if (entity->interact( std::dynamic_pointer_cast( shared_from_this() ) )) return true; std::shared_ptr item = getSelectedItem(); - if (item != NULL && dynamic_pointer_cast( entity ) != NULL) + if (item != NULL && std::dynamic_pointer_cast( entity ) != NULL) { // 4J - PC Comments // Hack to prevent item stacks from decrementing if the player has // the ability to instabuild if(this->abilities.instabuild) item = item->copy(); - if(item->interactEnemy(dynamic_pointer_cast(entity))) + if(item->interactEnemy(std::dynamic_pointer_cast(entity))) { // 4J - PC Comments // Don't remove the item in hand if the player has the ability @@ -1577,7 +1577,7 @@ void Player::attack(std::shared_ptr entity) int knockback = 0; int magicBoost = 0; - std::shared_ptr mob = dynamic_pointer_cast(entity); + std::shared_ptr mob = std::dynamic_pointer_cast(entity); if (mob != NULL) { magicBoost = EnchantmentHelper::getDamageBonus(inventory, mob); @@ -1600,14 +1600,14 @@ void Player::attack(std::shared_ptr entity) // Ensure we put the entity on fire if we're hitting with a // fire-enchanted weapon bool setOnFireTemporatily = false; - int fireAspect = EnchantmentHelper::getFireAspect(dynamic_pointer_cast(shared_from_this())); - if (dynamic_pointer_cast(entity) && fireAspect > 0 && !entity->isOnFire()) + int fireAspect = EnchantmentHelper::getFireAspect(std::dynamic_pointer_cast(shared_from_this())); + if (std::dynamic_pointer_cast(entity) && fireAspect > 0 && !entity->isOnFire()) { setOnFireTemporatily = true; entity->setOnFire(1); } - DamageSource *damageSource = DamageSource::playerAttack(dynamic_pointer_cast(shared_from_this())); + DamageSource *damageSource = DamageSource::playerAttack(std::dynamic_pointer_cast(shared_from_this())); bool wasHurt = entity->hurt(damageSource, dmg); delete damageSource; if (wasHurt) @@ -1635,7 +1635,7 @@ void Player::attack(std::shared_ptr entity) } setLastHurtMob(entity); - std::shared_ptr mob = dynamic_pointer_cast(entity); + std::shared_ptr mob = std::dynamic_pointer_cast(entity); if (mob) { ThornsEnchantment::doThornsAfterAttack(shared_from_this(), mob, random); @@ -1643,19 +1643,19 @@ void Player::attack(std::shared_ptr entity) } std::shared_ptr item = getSelectedItem(); - if (item != NULL && dynamic_pointer_cast( entity ) != NULL) + if (item != NULL && std::dynamic_pointer_cast( entity ) != NULL) { - item->hurtEnemy(dynamic_pointer_cast(entity), dynamic_pointer_cast( shared_from_this() ) ); + item->hurtEnemy(std::dynamic_pointer_cast(entity), std::dynamic_pointer_cast( shared_from_this() ) ); if (item->count <= 0) { removeSelectedItem(); } } - if (dynamic_pointer_cast( entity ) != NULL) + if (std::dynamic_pointer_cast( entity ) != NULL) { if (entity->isAlive()) { - directAllTameWolvesOnTarget(dynamic_pointer_cast(entity), true); + directAllTameWolvesOnTarget(std::dynamic_pointer_cast(entity), true); } // 4J Stu - Brought forward wasHurt check to Fix 66140 - Bug: Fire Aspect bypasses "Player v Player" being Disabled if (fireAspect > 0 && wasHurt) @@ -1708,10 +1708,10 @@ Slot *Player::getInventorySlot(int slotId) void Player::remove() { this->Mob::remove(); - inventoryMenu->removed( dynamic_pointer_cast( shared_from_this() ) ); + inventoryMenu->removed( std::dynamic_pointer_cast( shared_from_this() ) ); if (containerMenu != NULL) { - containerMenu->removed( dynamic_pointer_cast( shared_from_this() ) ); + containerMenu->removed( std::dynamic_pointer_cast( shared_from_this() ) ); } } @@ -2142,7 +2142,7 @@ void Player::checkRidingStatistiscs(double dx, double dy, double dz) int distance = (int) Math::round(sqrt(dx * dx + dy * dy + dz * dz) * 100.0f); if (distance > 0) { - if ( dynamic_pointer_cast( riding ) ) + if ( std::dynamic_pointer_cast( riding ) ) { distanceMinecart += distance; if( distanceMinecart >= 100 ) @@ -2189,7 +2189,7 @@ void Player::checkRidingStatistiscs(double dx, double dy, double dz) } } - else if (dynamic_pointer_cast( riding ) != NULL) + else if (std::dynamic_pointer_cast( riding ) != NULL) { distanceBoat += distance; if( distanceBoat >= 100 ) @@ -2199,7 +2199,7 @@ void Player::checkRidingStatistiscs(double dx, double dy, double dz) awardStat(GenericStats::boatOneM(), GenericStats::param_boat(newDistance/100) ); } } - else if (dynamic_pointer_cast( riding ) != NULL) + else if (std::dynamic_pointer_cast( riding ) != NULL) { distancePig += distance; if( distancePig >= 100 ) @@ -2235,7 +2235,7 @@ void Player::causeFallDamage(float distance) void Player::killed(std::shared_ptr mob) { // 4J-PB - added the lavaslime enemy - fix for #64007 - TU7: Code: Achievements: TCR#073: Killing Magma Cubes doesn't unlock "Monster Hunter" Achievement. - if( dynamic_pointer_cast( mob ) != NULL || mob->GetType() == eTYPE_GHAST || mob->GetType() == eTYPE_SLIME || mob->GetType() == eTYPE_LAVASLIME || mob->GetType() == eTYPE_ENDERDRAGON) + if( std::dynamic_pointer_cast( mob ) != NULL || mob->GetType() == eTYPE_GHAST || mob->GetType() == eTYPE_SLIME || mob->GetType() == eTYPE_LAVASLIME || mob->GetType() == eTYPE_ENDERDRAGON) { awardStat(GenericStats::killEnemy(), GenericStats::param_noArgs()); @@ -2425,7 +2425,7 @@ void Player::startUsingItem(std::shared_ptr instance, int duration // 4J-JEV, hook for ItemUsed event, and ironbelly achievement. awardStat(GenericStats::itemsUsed(instance->getItem()->id), - GenericStats::param_itemsUsed(dynamic_pointer_cast(shared_from_this()),instance)); + GenericStats::param_itemsUsed(std::dynamic_pointer_cast(shared_from_this()),instance)); #if (!defined _DURANGO) && (defined _EXTENDED_ACHIEVEMENTS) if ( (instance->getItem()->id == Item::rotten_flesh_Id) && (getFoodData()->getFoodLevel() == 0) ) @@ -2774,7 +2774,7 @@ bool Player::isAllowedToInteract(std::shared_ptr target) { if (getPlayerGamePrivilege(Player::ePlayerGamePrivilege_CanUseContainers) == 0) { - std::shared_ptr minecart = dynamic_pointer_cast( target ); + std::shared_ptr minecart = std::dynamic_pointer_cast( target ); if (minecart->type == Minecart::CHEST) allowed = false; } diff --git a/Minecraft.World/RandomStrollGoal.cpp b/Minecraft.World/RandomStrollGoal.cpp index 21f3adb1..133944c1 100644 --- a/Minecraft.World/RandomStrollGoal.cpp +++ b/Minecraft.World/RandomStrollGoal.cpp @@ -21,7 +21,7 @@ bool RandomStrollGoal::canUse() { if (mob->getRandom()->nextInt(120) == 0) { - Vec3 *pos = RandomPos::getPos(dynamic_pointer_cast(mob->shared_from_this()), 10, 7); + Vec3 *pos = RandomPos::getPos(std::dynamic_pointer_cast(mob->shared_from_this()), 10, 7); if (pos == NULL) return false; wantedX = pos->x; wantedY = pos->y; @@ -37,7 +37,7 @@ bool RandomStrollGoal::canUse() if( mob->isExtraWanderingEnabled() ) { - Vec3 *pos = RandomPos::getPos(dynamic_pointer_cast(mob->shared_from_this()), 10, 7,mob->getWanderingQuadrant()); + Vec3 *pos = RandomPos::getPos(std::dynamic_pointer_cast(mob->shared_from_this()), 10, 7,mob->getWanderingQuadrant()); if (pos == NULL) return false; wantedX = pos->x; wantedY = pos->y; diff --git a/Minecraft.World/RecordPlayerTile.cpp b/Minecraft.World/RecordPlayerTile.cpp index 12fd3590..ac39aab8 100644 --- a/Minecraft.World/RecordPlayerTile.cpp +++ b/Minecraft.World/RecordPlayerTile.cpp @@ -42,7 +42,7 @@ void RecordPlayerTile::setRecord(Level *level, int x, int y, int z, int record) { if (level->isClientSide) return; - std::shared_ptr rte = dynamic_pointer_cast( level->getTileEntity(x, y, z) ); + std::shared_ptr rte = std::dynamic_pointer_cast( level->getTileEntity(x, y, z) ); rte->record = record; rte->setChanged(); @@ -53,7 +53,7 @@ void RecordPlayerTile::dropRecording(Level *level, int x, int y, int z) { if (level->isClientSide) return; - std::shared_ptr rte = dynamic_pointer_cast( level->getTileEntity(x, y, z) ); + std::shared_ptr rte = std::dynamic_pointer_cast( level->getTileEntity(x, y, z) ); if( rte == NULL ) return; int oldRecord = rte->record; diff --git a/Minecraft.World/ResultSlot.cpp b/Minecraft.World/ResultSlot.cpp index d44083c7..bfd08d3a 100644 --- a/Minecraft.World/ResultSlot.cpp +++ b/Minecraft.World/ResultSlot.cpp @@ -35,7 +35,7 @@ void ResultSlot::onQuickCraft(std::shared_ptr picked, int count) void ResultSlot::checkTakeAchievements(std::shared_ptr carried) { - carried->onCraftedBy(player->level, dynamic_pointer_cast( player->shared_from_this() ), removeCount); + carried->onCraftedBy(player->level, std::dynamic_pointer_cast( player->shared_from_this() ), removeCount); removeCount = 0; if (carried->id == Tile::workBench_Id) player->awardStat(GenericStats::buildWorkbench(), GenericStats::param_buildWorkbench()); diff --git a/Minecraft.World/RotateHeadPacket.cpp b/Minecraft.World/RotateHeadPacket.cpp index 46d48a99..f3ddc17b 100644 --- a/Minecraft.World/RotateHeadPacket.cpp +++ b/Minecraft.World/RotateHeadPacket.cpp @@ -41,7 +41,7 @@ bool RotateHeadPacket::canBeInvalidated() bool RotateHeadPacket::isInvalidatedBy(std::shared_ptr packet) { - std::shared_ptr target = dynamic_pointer_cast(packet); + std::shared_ptr target = std::dynamic_pointer_cast(packet); return target->id == id; } diff --git a/Minecraft.World/SaddleItem.cpp b/Minecraft.World/SaddleItem.cpp index 1f9c580d..f30ad1b7 100644 --- a/Minecraft.World/SaddleItem.cpp +++ b/Minecraft.World/SaddleItem.cpp @@ -11,9 +11,9 @@ SaddleItem::SaddleItem(int id) : Item(id) bool SaddleItem::interactEnemy(std::shared_ptr itemInstance, std::shared_ptr mob) { - if ( dynamic_pointer_cast(mob) ) + if ( std::dynamic_pointer_cast(mob) ) { - std::shared_ptr pig = dynamic_pointer_cast(mob); + std::shared_ptr pig = std::dynamic_pointer_cast(mob); if (!pig->hasSaddle() && !pig->isBaby()) { pig->setSaddle(true); diff --git a/Minecraft.World/SavedDataStorage.cpp b/Minecraft.World/SavedDataStorage.cpp index 67b15c51..099eaf60 100644 --- a/Minecraft.World/SavedDataStorage.cpp +++ b/Minecraft.World/SavedDataStorage.cpp @@ -32,16 +32,16 @@ std::shared_ptr SavedDataStorage::get(const type_info& clazz, const w ConsoleSavePath file = levelStorage->getDataFile(id); if (!file.getName().empty() && levelStorage->getSaveFile()->doesFileExist( file ) ) { - // mob = dynamic_pointer_cast(Mob::_class->newInstance( level )); + // mob = std::dynamic_pointer_cast(Mob::_class->newInstance( level )); //data = clazz.getConstructor(String.class).newInstance(id); if( clazz == typeid(MapItemSavedData) ) { - data = dynamic_pointer_cast( std::shared_ptr(new MapItemSavedData(id)) ); + data = std::dynamic_pointer_cast( std::shared_ptr(new MapItemSavedData(id)) ); } else if( clazz == typeid(Villages) ) { - data = dynamic_pointer_cast( std::shared_ptr(new Villages(id) ) ); + data = std::dynamic_pointer_cast( std::shared_ptr(new Villages(id) ) ); } else { diff --git a/Minecraft.World/SetEntityMotionPacket.cpp b/Minecraft.World/SetEntityMotionPacket.cpp index 49dd7d6b..1c2d362c 100644 --- a/Minecraft.World/SetEntityMotionPacket.cpp +++ b/Minecraft.World/SetEntityMotionPacket.cpp @@ -108,6 +108,6 @@ bool SetEntityMotionPacket::canBeInvalidated() bool SetEntityMotionPacket::isInvalidatedBy(std::shared_ptr packet) { - std::shared_ptr target = dynamic_pointer_cast(packet); + std::shared_ptr target = std::dynamic_pointer_cast(packet); return target->id == id; } diff --git a/Minecraft.World/SetEquippedItemPacket.cpp b/Minecraft.World/SetEquippedItemPacket.cpp index cbb71803..89ce12de 100644 --- a/Minecraft.World/SetEquippedItemPacket.cpp +++ b/Minecraft.World/SetEquippedItemPacket.cpp @@ -64,6 +64,6 @@ bool SetEquippedItemPacket::canBeInvalidated() bool SetEquippedItemPacket::isInvalidatedBy(std::shared_ptr packet) { - std::shared_ptr target = dynamic_pointer_cast(packet); + std::shared_ptr target = std::dynamic_pointer_cast(packet); return target->entity == entity && target->slot == slot; } \ No newline at end of file diff --git a/Minecraft.World/SetRidingPacket.cpp b/Minecraft.World/SetRidingPacket.cpp index de7b0bf2..97cd6238 100644 --- a/Minecraft.World/SetRidingPacket.cpp +++ b/Minecraft.World/SetRidingPacket.cpp @@ -48,6 +48,6 @@ bool SetRidingPacket::canBeInvalidated() bool SetRidingPacket::isInvalidatedBy(std::shared_ptr packet) { - std::shared_ptr target = dynamic_pointer_cast(packet); + std::shared_ptr target = std::dynamic_pointer_cast(packet); return target->riderId == riderId; } diff --git a/Minecraft.World/Sheep.cpp b/Minecraft.World/Sheep.cpp index cc1d69ed..a1bb534b 100644 --- a/Minecraft.World/Sheep.cpp +++ b/Minecraft.World/Sheep.cpp @@ -277,9 +277,9 @@ std::shared_ptr Sheep::getBreedOffspring(std::shared_ptr t // 4J - added limit to number of animals that can be bred if( level->canCreateMore( GetType(), Level::eSpawnType_Breed) ) { - std::shared_ptr otherSheep = dynamic_pointer_cast( target ); + std::shared_ptr otherSheep = std::dynamic_pointer_cast( target ); std::shared_ptr sheep = std::shared_ptr( new Sheep(level) ); - int color = getOffspringColor(dynamic_pointer_cast(shared_from_this()), otherSheep); + int color = getOffspringColor(std::dynamic_pointer_cast(shared_from_this()), otherSheep); sheep->setColor(15 - color); return sheep; } @@ -333,5 +333,5 @@ int Sheep::getOffspringColor(std::shared_ptr animal, std::shared_ptr animal) { - return 15 - dynamic_pointer_cast(animal)->getColor(); + return 15 - std::dynamic_pointer_cast(animal)->getColor(); } diff --git a/Minecraft.World/SignItem.cpp b/Minecraft.World/SignItem.cpp index fa9d6772..209c2403 100644 --- a/Minecraft.World/SignItem.cpp +++ b/Minecraft.World/SignItem.cpp @@ -43,7 +43,7 @@ bool SignItem::useOn(std::shared_ptr instance, std::shared_ptrcount--; - std::shared_ptr ste = dynamic_pointer_cast( level->getTileEntity(x, y, z) ); + std::shared_ptr ste = std::dynamic_pointer_cast( level->getTileEntity(x, y, z) ); if (ste != NULL) player->openTextEdit(ste); // 4J-JEV: Hook for durango 'BlockPlaced' event. diff --git a/Minecraft.World/SignTile.cpp b/Minecraft.World/SignTile.cpp index 363ef5be..28ce3e18 100644 --- a/Minecraft.World/SignTile.cpp +++ b/Minecraft.World/SignTile.cpp @@ -80,7 +80,7 @@ std::shared_ptr SignTile::newTileEntity(Level *level) //try { // 4J Stu - For some reason the newInstance wasn't working right, but doing it like the other TileEntities is fine return std::shared_ptr( new SignTileEntity() ); - //return dynamic_pointer_cast( clas->newInstance() ); + //return std::dynamic_pointer_cast( clas->newInstance() ); //} catch (Exception e) { // TODO 4J Stu - Exception handling // throw new RuntimeException(e); diff --git a/Minecraft.World/Silverfish.cpp b/Minecraft.World/Silverfish.cpp index 24745b6c..35f3e7f4 100644 --- a/Minecraft.World/Silverfish.cpp +++ b/Minecraft.World/Silverfish.cpp @@ -86,7 +86,7 @@ void Silverfish::checkHurtTarget(std::shared_ptr target, float d) if (attackTime <= 0 && d < 1.2f && target->bb->y1 > bb->y0 && target->bb->y0 < bb->y1) { attackTime = 20; - DamageSource *damageSource = DamageSource::mobAttack( dynamic_pointer_cast( shared_from_this() ) ); + DamageSource *damageSource = DamageSource::mobAttack( std::dynamic_pointer_cast( shared_from_this() ) ); target->hurt(damageSource, attackDamage); delete damageSource; } diff --git a/Minecraft.World/Skeleton.cpp b/Minecraft.World/Skeleton.cpp index 4f28327c..b388f171 100644 --- a/Minecraft.World/Skeleton.cpp +++ b/Minecraft.World/Skeleton.cpp @@ -101,8 +101,8 @@ void Skeleton::aiStep() void Skeleton::die(DamageSource *source) { Monster::die(source); - std::shared_ptr player = dynamic_pointer_cast( source->getEntity() ); - if ( dynamic_pointer_cast( source->getDirectEntity() ) != NULL && player != NULL) + std::shared_ptr player = std::dynamic_pointer_cast( source->getEntity() ); + if ( std::dynamic_pointer_cast( source->getDirectEntity() ) != NULL && player != NULL) { double xd = player->x - x; double zd = player->z - z; diff --git a/Minecraft.World/SkullItem.cpp b/Minecraft.World/SkullItem.cpp index 36825d9f..0fe15efd 100644 --- a/Minecraft.World/SkullItem.cpp +++ b/Minecraft.World/SkullItem.cpp @@ -46,7 +46,7 @@ bool SkullItem::useOn(std::shared_ptr instance, std::shared_ptr skullTE = level->getTileEntity(x, y, z); - std::shared_ptr skull = dynamic_pointer_cast(skullTE); + std::shared_ptr skull = std::dynamic_pointer_cast(skullTE); if (skull != NULL) { diff --git a/Minecraft.World/SkullTile.cpp b/Minecraft.World/SkullTile.cpp index 38c47479..98f07bf2 100644 --- a/Minecraft.World/SkullTile.cpp +++ b/Minecraft.World/SkullTile.cpp @@ -75,7 +75,7 @@ int SkullTile::cloneTileId(Level *level, int x, int y, int z) int SkullTile::cloneTileData(Level *level, int x, int y, int z) { std::shared_ptr tileEntity = level->getTileEntity(x, y, z); - std::shared_ptr skull = dynamic_pointer_cast(tileEntity); + std::shared_ptr skull = std::dynamic_pointer_cast(tileEntity); if (skull != NULL) { return skull->getSkullType(); @@ -117,7 +117,7 @@ void SkullTile::onRemove(Level *level, int x, int y, int z)//, int id, int data) if ((data & NO_DROP_BIT) == 0) { std::shared_ptr item = std::shared_ptr(new ItemInstance(Item::skull_Id, 1, cloneTileData(level, x, y, z))); - std::shared_ptr entity = dynamic_pointer_cast(level->getTileEntity(x, y, z)); + std::shared_ptr entity = std::dynamic_pointer_cast(level->getTileEntity(x, y, z)); if (entity->getSkullType() == SkullTileEntity::TYPE_CHAR && !entity->getExtraType().empty()) { @@ -245,7 +245,7 @@ bool SkullTile::isSkullAt(Level *level, int x, int y, int z, int skullType) return false; } std::shared_ptr te = level->getTileEntity(x, y, z); - std::shared_ptr skull = dynamic_pointer_cast(te); + std::shared_ptr skull = std::dynamic_pointer_cast(te); if (skull == NULL) { return false; diff --git a/Minecraft.World/Slime.cpp b/Minecraft.World/Slime.cpp index 47b64482..53ab554f 100644 --- a/Minecraft.World/Slime.cpp +++ b/Minecraft.World/Slime.cpp @@ -213,7 +213,7 @@ void Slime::playerTouch(std::shared_ptr player) int size = getSize(); if (canSee(player) && this->distanceToSqr(player) < (0.6 * size) * (0.6 * size)) { - DamageSource *damageSource = DamageSource::mobAttack( dynamic_pointer_cast( shared_from_this() ) ); + DamageSource *damageSource = DamageSource::mobAttack( std::dynamic_pointer_cast( shared_from_this() ) ); if (player->hurt(damageSource, getAttackDamage())) { level->playSound(shared_from_this(), eSoundType_MOB_SLIME_ATTACK, 1, (random->nextFloat() - random->nextFloat()) * 0.2f + 1.0f); diff --git a/Minecraft.World/SmallFireball.cpp b/Minecraft.World/SmallFireball.cpp index be84e82c..16829353 100644 --- a/Minecraft.World/SmallFireball.cpp +++ b/Minecraft.World/SmallFireball.cpp @@ -27,7 +27,7 @@ void SmallFireball::onHit(HitResult *res) { if (res->entity != NULL) { - DamageSource *damageSource = DamageSource::fireball(dynamic_pointer_cast(shared_from_this()),owner); + DamageSource *damageSource = DamageSource::fireball(std::dynamic_pointer_cast(shared_from_this()),owner); if (!res->entity->isFireImmune() && res->entity->hurt(damageSource, 5)) { res->entity->setOnFire(5); diff --git a/Minecraft.World/Snowball.cpp b/Minecraft.World/Snowball.cpp index 37983a68..84c341bc 100644 --- a/Minecraft.World/Snowball.cpp +++ b/Minecraft.World/Snowball.cpp @@ -34,7 +34,7 @@ void Snowball::onHit(HitResult *res) if (res->entity != NULL) { int damage = 0; - if (dynamic_pointer_cast(res->entity) != NULL) + if (std::dynamic_pointer_cast(res->entity) != NULL) { damage = 3; } diff --git a/Minecraft.World/StrongholdPieces.cpp b/Minecraft.World/StrongholdPieces.cpp index 05ccec39..a6f47cf0 100644 --- a/Minecraft.World/StrongholdPieces.cpp +++ b/Minecraft.World/StrongholdPieces.cpp @@ -1473,7 +1473,7 @@ bool StrongholdPieces::PortalRoom::postProcess(Level *level, Random *random, Bou hasPlacedMobSpawner = true; level->setTile(x, y, z, Tile::mobSpawner_Id); - std::shared_ptr entity = dynamic_pointer_cast(level->getTileEntity(x, y, z)); + std::shared_ptr entity = std::dynamic_pointer_cast(level->getTileEntity(x, y, z)); if (entity != NULL) entity->setEntityId(L"Silverfish"); } } diff --git a/Minecraft.World/StructurePiece.cpp b/Minecraft.World/StructurePiece.cpp index e4fd3fab..cb597d2f 100644 --- a/Minecraft.World/StructurePiece.cpp +++ b/Minecraft.World/StructurePiece.cpp @@ -781,7 +781,7 @@ bool StructurePiece::createChest( Level* level, BoundingBox* chunkBB, Random* ra if ( level->getTile( worldX, worldY, worldZ ) != Tile::chest->id ) { level->setTile( worldX, worldY, worldZ, Tile::chest->id ); - std::shared_ptr chest = dynamic_pointer_cast(level->getTileEntity( worldX, worldY, worldZ )); + std::shared_ptr chest = std::dynamic_pointer_cast(level->getTileEntity( worldX, worldY, worldZ )); if ( chest != NULL ) WeighedTreasure::addChestItems( random, treasure, chest, numRolls ); return true; } @@ -800,7 +800,7 @@ bool StructurePiece::createDispenser(Level *level, BoundingBox *chunkBB, Random if (level->getTile(worldX, worldY, worldZ) != Tile::dispenser_Id) { level->setTileAndData(worldX, worldY, worldZ, Tile::dispenser_Id, getOrientationData(Tile::dispenser_Id, facing)); - std::shared_ptr dispenser = dynamic_pointer_cast(level->getTileEntity(worldX, worldY, worldZ)); + std::shared_ptr dispenser = std::dynamic_pointer_cast(level->getTileEntity(worldX, worldY, worldZ)); if (dispenser != NULL) WeighedTreasure::addDispenserItems(random, items, dispenser, numRolls); return true; } diff --git a/Minecraft.World/TakeFlowerGoal.cpp b/Minecraft.World/TakeFlowerGoal.cpp index e67edd86..1be01965 100644 --- a/Minecraft.World/TakeFlowerGoal.cpp +++ b/Minecraft.World/TakeFlowerGoal.cpp @@ -33,7 +33,7 @@ bool TakeFlowerGoal::canUse() //for (Entity e : golems) for(AUTO_VAR(it,golems->begin()); it != golems->end(); ++it) { - std::shared_ptr vg = dynamic_pointer_cast(*it); + std::shared_ptr vg = std::dynamic_pointer_cast(*it); if (vg->getOfferFlowerTick() > 0) { golem = weak_ptr(vg); diff --git a/Minecraft.World/TargetGoal.cpp b/Minecraft.World/TargetGoal.cpp index 28102c60..8f6eaa47 100644 --- a/Minecraft.World/TargetGoal.cpp +++ b/Minecraft.World/TargetGoal.cpp @@ -69,16 +69,16 @@ bool TargetGoal::canAttack(std::shared_ptr target, bool allowInvulnerable) if (!target->isAlive()) return false; if (!mob->canAttackType(target->GetType())) return false; - std::shared_ptr tamableAnimal = dynamic_pointer_cast(mob->shared_from_this()); + std::shared_ptr tamableAnimal = std::dynamic_pointer_cast(mob->shared_from_this()); if (tamableAnimal != NULL && tamableAnimal->isTame()) { - std::shared_ptr tamableTarget = dynamic_pointer_cast(target); + std::shared_ptr tamableTarget = std::dynamic_pointer_cast(target); if (tamableTarget != NULL && tamableTarget->isTame()) return false; if (target == tamableAnimal->getOwner()) return false; } - else if (dynamic_pointer_cast(target) != NULL) + else if (std::dynamic_pointer_cast(target) != NULL) { - if (!allowInvulnerable && (dynamic_pointer_cast(target))->abilities.invulnerable) return false; + if (!allowInvulnerable && (std::dynamic_pointer_cast(target))->abilities.invulnerable) return false; } if (!mob->isWithinRestriction(Mth::floor(target->x), Mth::floor(target->y), Mth::floor(target->z))) return false; diff --git a/Minecraft.World/TeleportEntityPacket.cpp b/Minecraft.World/TeleportEntityPacket.cpp index 1ca53966..e22e80f1 100644 --- a/Minecraft.World/TeleportEntityPacket.cpp +++ b/Minecraft.World/TeleportEntityPacket.cpp @@ -86,6 +86,6 @@ bool TeleportEntityPacket::canBeInvalidated() bool TeleportEntityPacket::isInvalidatedBy(std::shared_ptr packet) { - std::shared_ptr target = dynamic_pointer_cast(packet); + std::shared_ptr target = std::dynamic_pointer_cast(packet); return target->id == id; } \ No newline at end of file diff --git a/Minecraft.World/TheEndPortal.cpp b/Minecraft.World/TheEndPortal.cpp index 78e154f4..6156ac35 100644 --- a/Minecraft.World/TheEndPortal.cpp +++ b/Minecraft.World/TheEndPortal.cpp @@ -66,7 +66,7 @@ void TheEndPortal::entityInside(Level *level, int x, int y, int z, std::shared_p { if (entity->riding == NULL && entity->rider.lock() == NULL) { - if (dynamic_pointer_cast(entity) != NULL) + if (std::dynamic_pointer_cast(entity) != NULL) { if (!level->isClientSide) { @@ -80,7 +80,7 @@ void TheEndPortal::entityInside(Level *level, int x, int y, int z, std::shared_p level->getLevelData()->setHasStrongholdEndPortal(); } - (dynamic_pointer_cast(entity))->changeDimension(1); + (std::dynamic_pointer_cast(entity))->changeDimension(1); } } } diff --git a/Minecraft.World/ThrownEnderpearl.cpp b/Minecraft.World/ThrownEnderpearl.cpp index 778a4701..0aa357d0 100644 --- a/Minecraft.World/ThrownEnderpearl.cpp +++ b/Minecraft.World/ThrownEnderpearl.cpp @@ -47,7 +47,7 @@ void ThrownEnderpearl::onHit(HitResult *res) { // Fix for #67486 - TCR #001: BAS Game Stability: Customer Encountered: TU8: Code: Gameplay: The title crashes on Host's console when Client Player leaves the game before the Ender Pearl thrown by him touches the ground. // If the owner has been removed, then ignore - std::shared_ptr serverPlayer = dynamic_pointer_cast(owner); + std::shared_ptr serverPlayer = std::dynamic_pointer_cast(owner); if (serverPlayer != NULL && !serverPlayer->removed) { if(!serverPlayer->connection->done && serverPlayer->level == this->level) diff --git a/Minecraft.World/ThrownPotion.cpp b/Minecraft.World/ThrownPotion.cpp index 09280476..ab947004 100644 --- a/Minecraft.World/ThrownPotion.cpp +++ b/Minecraft.World/ThrownPotion.cpp @@ -82,7 +82,7 @@ void ThrownPotion::onHit(HitResult *res) for(AUTO_VAR(it, entitiesOfClass->begin()); it != entitiesOfClass->end(); ++it) { //std::shared_ptr e = *it; - std::shared_ptr e = dynamic_pointer_cast( *it ); + std::shared_ptr e = std::dynamic_pointer_cast( *it ); double dist = distanceToSqr(e); if (dist < SPLASH_RANGE_SQ) { diff --git a/Minecraft.World/TileDestructionPacket.cpp b/Minecraft.World/TileDestructionPacket.cpp index 98aa4ad5..b47ba517 100644 --- a/Minecraft.World/TileDestructionPacket.cpp +++ b/Minecraft.World/TileDestructionPacket.cpp @@ -80,6 +80,6 @@ bool TileDestructionPacket::canBeInvalidated() bool TileDestructionPacket::isInvalidatedBy(std::shared_ptr packet) { - std::shared_ptr target = dynamic_pointer_cast(packet); + std::shared_ptr target = std::dynamic_pointer_cast(packet); return target->id == id; } \ No newline at end of file diff --git a/Minecraft.World/TntTile.cpp b/Minecraft.World/TntTile.cpp index 5d47a2ac..dd90d539 100644 --- a/Minecraft.World/TntTile.cpp +++ b/Minecraft.World/TntTile.cpp @@ -98,7 +98,7 @@ void TntTile::entityInside(Level *level, int x, int y, int z, std::shared_ptrGetType() == eTYPE_ARROW && !level->isClientSide) { // 4J Stu - Don't need to cast this - //std::shared_ptr arrow = dynamic_pointer_cast(entity); + //std::shared_ptr arrow = std::dynamic_pointer_cast(entity); if (entity->isOnFire()) { destroy(level, x, y, z, EXPLODE_BIT); diff --git a/Minecraft.World/TreeTile.cpp b/Minecraft.World/TreeTile.cpp index fa734a7c..05bf14da 100644 --- a/Minecraft.World/TreeTile.cpp +++ b/Minecraft.World/TreeTile.cpp @@ -63,7 +63,7 @@ void TreeTile::onRemove(Level *level, int x, int y, int z, int id, int data) void TreeTile::setPlacedBy(Level *level, int x, int y, int z, std::shared_ptr by) { int type = level->getData(x, y, z) & MASK_TYPE; - int dir = PistonBaseTile::getNewFacing(level, x, y, z, dynamic_pointer_cast(by)); + int dir = PistonBaseTile::getNewFacing(level, x, y, z, std::dynamic_pointer_cast(by)); int facing = 0; switch (dir) diff --git a/Minecraft.World/UpdateMobEffectPacket.cpp b/Minecraft.World/UpdateMobEffectPacket.cpp index 7274152e..70cc2a6f 100644 --- a/Minecraft.World/UpdateMobEffectPacket.cpp +++ b/Minecraft.World/UpdateMobEffectPacket.cpp @@ -55,6 +55,6 @@ bool UpdateMobEffectPacket::canBeInvalidated() bool UpdateMobEffectPacket::isInvalidatedBy(std::shared_ptr packet) { - std::shared_ptr target = dynamic_pointer_cast(packet); + std::shared_ptr target = std::dynamic_pointer_cast(packet); return target->entityId == entityId && target->effectId == effectId; } \ No newline at end of file diff --git a/Minecraft.World/Villager.cpp b/Minecraft.World/Villager.cpp index 4618e4be..32411a9a 100644 --- a/Minecraft.World/Villager.cpp +++ b/Minecraft.World/Villager.cpp @@ -157,7 +157,7 @@ bool Villager::interact(std::shared_ptr player) { // note: stop() logic is controlled by trading ai goal setTradingPlayer(player); - player->openTrading(dynamic_pointer_cast(shared_from_this())); + player->openTrading(std::dynamic_pointer_cast(shared_from_this())); } return true; } @@ -289,7 +289,7 @@ void Villager::setLastHurtByMob(std::shared_ptr mob) { _village->addAggressor(mob); - std::shared_ptr player = dynamic_pointer_cast(mob); + std::shared_ptr player = std::dynamic_pointer_cast(mob); if (player) { int amount = -1; @@ -316,7 +316,7 @@ void Villager::die(DamageSource *source) { if ((sourceEntity->GetType() & eTYPE_PLAYER) == eTYPE_PLAYER) { - std::shared_ptr player = dynamic_pointer_cast(sourceEntity); + std::shared_ptr player = std::dynamic_pointer_cast(sourceEntity); _village->modifyStanding(player->getName(), -2); } else if ((sourceEntity->GetType() & eTYPE_ENEMY) == eTYPE_ENEMY) diff --git a/Minecraft.World/VillagerGolem.cpp b/Minecraft.World/VillagerGolem.cpp index 3856aff6..40a3386c 100644 --- a/Minecraft.World/VillagerGolem.cpp +++ b/Minecraft.World/VillagerGolem.cpp @@ -137,7 +137,7 @@ bool VillagerGolem::doHurtTarget(std::shared_ptr target) { attackAnimationTick = 10; level->broadcastEntityEvent(shared_from_this(), EntityEvent::START_ATTACKING); - bool hurt = target->hurt(DamageSource::mobAttack(dynamic_pointer_cast(shared_from_this())), 7 + random->nextInt(15)); + bool hurt = target->hurt(DamageSource::mobAttack(std::dynamic_pointer_cast(shared_from_this())), 7 + random->nextInt(15)); if (hurt) target->yd += 0.4f; level->playSound(shared_from_this(), eSoundType_MOB_IRONGOLEM_THROW, 1, 1); return hurt; diff --git a/Minecraft.World/WaterLilyTile.cpp b/Minecraft.World/WaterLilyTile.cpp index 936005dd..1148383b 100644 --- a/Minecraft.World/WaterLilyTile.cpp +++ b/Minecraft.World/WaterLilyTile.cpp @@ -25,7 +25,7 @@ int WaterlilyTile::getRenderShape() void WaterlilyTile::addAABBs(Level *level, int x, int y, int z, AABB *box, AABBList *boxes, std::shared_ptr source) { - if (source == NULL || !(dynamic_pointer_cast(source))) + if (source == NULL || !(std::dynamic_pointer_cast(source))) { Bush::addAABBs(level, x, y, z, box, boxes, source); } diff --git a/Minecraft.World/Wolf.cpp b/Minecraft.World/Wolf.cpp index 2e98e7cc..eb8f7e1a 100644 --- a/Minecraft.World/Wolf.cpp +++ b/Minecraft.World/Wolf.cpp @@ -63,7 +63,7 @@ bool Wolf::useNewAi() void Wolf::setTarget(std::shared_ptr target) { TamableAnimal::setTarget(target); - if ( dynamic_pointer_cast(target) == NULL ) + if ( std::dynamic_pointer_cast(target) == NULL ) { setAngry(false); } @@ -294,7 +294,7 @@ bool Wolf::hurt(DamageSource *source, int dmg) if (isInvulnerable()) return false; std::shared_ptr sourceEntity = source->getEntity(); sitGoal->wantToSit(false); - if (sourceEntity != NULL && !(dynamic_pointer_cast(sourceEntity) != NULL || dynamic_pointer_cast(sourceEntity) != NULL)) + if (sourceEntity != NULL && !(std::dynamic_pointer_cast(sourceEntity) != NULL || std::dynamic_pointer_cast(sourceEntity) != NULL)) { // take half damage from non-players and arrows dmg = (dmg + 1) / 2; @@ -305,7 +305,7 @@ bool Wolf::hurt(DamageSource *source, int dmg) bool Wolf::doHurtTarget(std::shared_ptr target) { int damage = isTame() ? 4 : 2; - return target->hurt(DamageSource::mobAttack(dynamic_pointer_cast(shared_from_this())), damage); + return target->hurt(DamageSource::mobAttack(std::dynamic_pointer_cast(shared_from_this())), damage); } void Wolf::tame(const wstring &wsOwnerUUID, bool bDisplayTamingParticles, bool bSetSitting) @@ -536,7 +536,7 @@ bool Wolf::canMate(std::shared_ptr animal) { if (animal == shared_from_this()) return false; if (!isTame()) return false; - std::shared_ptr partner = dynamic_pointer_cast(animal); + std::shared_ptr partner = std::dynamic_pointer_cast(animal); if (partner == NULL) return false; if (!partner->isTame()) return false; if (partner->isSitting()) return false; -- cgit v1.2.3