shared_ptr -> std::shared_ptr
This is one of the first commits in a plan to remove all `using namespace std;` lines in the entire codebase as it is considered anti-pattern today.
This commit is contained in:
@@ -100,8 +100,8 @@ private:
|
||||
bool hasGapsToCheck;
|
||||
public:
|
||||
|
||||
unordered_map<TilePos, shared_ptr<TileEntity>, TilePosKeyHash, TilePosKeyEq> tileEntities;
|
||||
vector<shared_ptr<Entity> > **entityBlocks;
|
||||
unordered_map<TilePos, std::shared_ptr<TileEntity>, TilePosKeyHash, TilePosKeyEq> tileEntities;
|
||||
vector<std::shared_ptr<Entity> > **entityBlocks;
|
||||
|
||||
static const int sTerrainPopulatedFromHere = 2;
|
||||
static const int sTerrainPopulatedFromW = 4;
|
||||
@@ -188,14 +188,14 @@ public:
|
||||
virtual void getNeighbourBrightnesses(int *brightnesses, LightLayer::variety layer, int x, int y, int z); // 4J added
|
||||
virtual void setBrightness(LightLayer::variety layer, int x, int y, int z, int brightness);
|
||||
virtual int getRawBrightness(int x, int y, int z, int skyDampen);
|
||||
virtual void addEntity(shared_ptr<Entity> e);
|
||||
virtual void removeEntity(shared_ptr<Entity> e);
|
||||
virtual void removeEntity(shared_ptr<Entity> e, int yc);
|
||||
virtual void addEntity(std::shared_ptr<Entity> e);
|
||||
virtual void removeEntity(std::shared_ptr<Entity> e);
|
||||
virtual void removeEntity(std::shared_ptr<Entity> e, int yc);
|
||||
virtual bool isSkyLit(int x, int y, int z);
|
||||
virtual void skyBrightnessChanged();
|
||||
virtual shared_ptr<TileEntity> getTileEntity(int x, int y, int z);
|
||||
virtual void addTileEntity(shared_ptr<TileEntity> te);
|
||||
virtual void setTileEntity(int x, int y, int z, shared_ptr<TileEntity> tileEntity);
|
||||
virtual std::shared_ptr<TileEntity> getTileEntity(int x, int y, int z);
|
||||
virtual void addTileEntity(std::shared_ptr<TileEntity> te);
|
||||
virtual void setTileEntity(int x, int y, int z, std::shared_ptr<TileEntity> tileEntity);
|
||||
virtual void removeTileEntity(int x, int y, int z);
|
||||
virtual void load();
|
||||
virtual void unload(bool unloadTileEntities) ; // 4J - added parameter
|
||||
@@ -203,8 +203,8 @@ public:
|
||||
virtual bool isUnloaded();
|
||||
#endif
|
||||
virtual void markUnsaved();
|
||||
virtual void getEntities(shared_ptr<Entity> except, AABB *bb, vector<shared_ptr<Entity> > &es);
|
||||
virtual void getEntitiesOfClass(const type_info& ec, AABB *bb, vector<shared_ptr<Entity> > &es);
|
||||
virtual void getEntities(std::shared_ptr<Entity> except, AABB *bb, vector<std::shared_ptr<Entity> > &es);
|
||||
virtual void getEntitiesOfClass(const type_info& ec, AABB *bb, vector<std::shared_ptr<Entity> > &es);
|
||||
virtual int countEntities();
|
||||
virtual bool shouldSave(bool force);
|
||||
virtual int getBlocksAndData(byteArray *data, int x0, int y0, int z0, int x1, int y1, int z1, int p, bool includeLighting = true); // 4J - added includeLighting parameter
|
||||
|
||||
Reference in New Issue
Block a user