From 119bff351450ea16ffda550b6e0f67379b29f708 Mon Sep 17 00:00:00 2001 From: void_17 Date: Mon, 2 Mar 2026 17:37:16 +0700 Subject: Revert "shared_ptr -> std::shared_ptr" This reverts commit 7074f35e4ba831e358117842b99ee35b87f85ae5. --- Minecraft.World/VillageSiege.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'Minecraft.World/VillageSiege.cpp') diff --git a/Minecraft.World/VillageSiege.cpp b/Minecraft.World/VillageSiege.cpp index afd378fc..55b2a3e8 100644 --- a/Minecraft.World/VillageSiege.cpp +++ b/Minecraft.World/VillageSiege.cpp @@ -77,12 +77,12 @@ void VillageSiege::tick() bool VillageSiege::tryToSetupSiege() { - vector > *players = &level->players; + vector > *players = &level->players; //for (Player player : players) for(AUTO_VAR(it, players->begin()); it != players->end(); ++it) { - std::shared_ptr player = *it; - std::shared_ptr _village = level->villages->getClosestVillage((int) player->x, (int) player->y, (int) player->z, 1); + shared_ptr player = *it; + shared_ptr _village = level->villages->getClosestVillage((int) player->x, (int) player->y, (int) player->z, 1); village = _village; if (_village == NULL) continue; @@ -101,11 +101,11 @@ bool VillageSiege::tryToSetupSiege() spawnY = center->y; spawnZ = center->z + (int) (Mth::sin(level->random->nextFloat() * PI * 2.f) * radius * 0.9); overlaps = false; - vector > *villages = level->villages->getVillages(); + vector > *villages = level->villages->getVillages(); //for (Village v : level.villages.getVillages()) for(AUTO_VAR(itV, villages->begin()); itV != villages->end(); ++itV) { - std::shared_ptrv = *itV; + shared_ptrv = *itV; if (v == _village) continue; if (v->isInside(spawnX, spawnY, spawnZ)) { @@ -131,10 +131,10 @@ bool VillageSiege::trySpawn() { Vec3 *spawnPos = findRandomSpawnPos(spawnX, spawnY, spawnZ); if (spawnPos == NULL) return false; - std::shared_ptr mob; + shared_ptr mob; //try { - mob = std::shared_ptr( new Zombie(level) ); + mob = shared_ptr( new Zombie(level) ); mob->finalizeMobSpawn(); mob->setVillager(false); } @@ -144,7 +144,7 @@ bool VillageSiege::trySpawn() //} mob->moveTo(spawnPos->x, spawnPos->y, spawnPos->z, level->random->nextFloat() * 360, 0); level->addEntity(mob); - std::shared_ptr _village = village.lock(); + shared_ptr _village = village.lock(); if( _village == NULL ) return false; Pos *center = _village->getCenter(); @@ -154,7 +154,7 @@ bool VillageSiege::trySpawn() Vec3 *VillageSiege::findRandomSpawnPos(int x, int y, int z) { - std::shared_ptr _village = village.lock(); + shared_ptr _village = village.lock(); if( _village == NULL ) return NULL; for (int i = 0; i < 10; ++i) -- cgit v1.2.3