aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/Village.h
diff options
context:
space:
mode:
authorvoid_17 <heroerror3@gmail.com>2026-03-02 17:37:16 +0700
committervoid_17 <heroerror3@gmail.com>2026-03-02 17:37:16 +0700
commit119bff351450ea16ffda550b6e0f67379b29f708 (patch)
treed9f28714afd516bc2450f33b0a77c5e05ff4de90 /Minecraft.World/Village.h
parent8a2a62ea1d47364f802cf9aae97668bc4a7007b5 (diff)
Revert "shared_ptr -> std::shared_ptr"
This reverts commit 7074f35e4ba831e358117842b99ee35b87f85ae5.
Diffstat (limited to 'Minecraft.World/Village.h')
-rw-r--r--Minecraft.World/Village.h22
1 files changed, 11 insertions, 11 deletions
diff --git a/Minecraft.World/Village.h b/Minecraft.World/Village.h
index 27839d4e..07858ef9 100644
--- a/Minecraft.World/Village.h
+++ b/Minecraft.World/Village.h
@@ -4,7 +4,7 @@ class Village
{
private:
Level *level;
- vector<std::shared_ptr<DoorInfo> > doorInfos;
+ vector<shared_ptr<DoorInfo> > doorInfos;
Pos *accCenter;
Pos *center;
@@ -19,10 +19,10 @@ private:
class Aggressor
{
public:
- std::shared_ptr<Mob> mob;
+ shared_ptr<Mob> mob;
int timeStamp;
- Aggressor(std::shared_ptr<Mob> mob, int timeStamp);
+ Aggressor(shared_ptr<Mob> mob, int timeStamp);
};
vector<Aggressor *> aggressors;
@@ -50,16 +50,16 @@ public:
int getStableAge();
int getPopulationSize();
bool isInside(int xx, int yy, int zz);
- vector<std::shared_ptr<DoorInfo> > *getDoorInfos();
- std::shared_ptr<DoorInfo> getClosestDoorInfo(int x, int y, int z);
- std::shared_ptr<DoorInfo> getBestDoorInfo(int x, int y, int z);
+ vector<shared_ptr<DoorInfo> > *getDoorInfos();
+ shared_ptr<DoorInfo> getClosestDoorInfo(int x, int y, int z);
+ shared_ptr<DoorInfo> getBestDoorInfo(int x, int y, int z);
bool hasDoorInfo(int x, int y, int z);
- std::shared_ptr<DoorInfo> getDoorInfo(int x, int y, int z);
- void addDoorInfo(std::shared_ptr<DoorInfo> di);
+ shared_ptr<DoorInfo> getDoorInfo(int x, int y, int z);
+ void addDoorInfo(shared_ptr<DoorInfo> di);
bool canRemove();
- void addAggressor(std::shared_ptr<Mob> mob);
- std::shared_ptr<Mob> getClosestAggressor(std::shared_ptr<Mob> from);
- std::shared_ptr<Player> getClosestBadStandingPlayer(std::shared_ptr<Mob> from); // 4J Stu - Should be LivingEntity when we add that
+ void addAggressor(shared_ptr<Mob> mob);
+ shared_ptr<Mob> getClosestAggressor(shared_ptr<Mob> from);
+ shared_ptr<Player> getClosestBadStandingPlayer(shared_ptr<Mob> from); // 4J Stu - Should be LivingEntity when we add that
private:
void updateAggressors();