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:
@@ -64,7 +64,7 @@ void TopSnowTile::updateDefaultShape()
|
||||
updateShape(0);
|
||||
}
|
||||
|
||||
void TopSnowTile::updateShape(LevelSource *level, int x, int y, int z, int forceData, shared_ptr<TileEntity> forceEntity) // 4J added forceData, forceEntity param
|
||||
void TopSnowTile::updateShape(LevelSource *level, int x, int y, int z, int forceData, std::shared_ptr<TileEntity> forceEntity) // 4J added forceData, forceEntity param
|
||||
{
|
||||
updateShape(level->getData(x, y, z));
|
||||
}
|
||||
@@ -104,14 +104,14 @@ bool TopSnowTile::checkCanSurvive(Level *level, int x, int y, int z)
|
||||
}
|
||||
|
||||
|
||||
void TopSnowTile::playerDestroy(Level *level, shared_ptr<Player> player, int x, int y, int z, int data)
|
||||
void TopSnowTile::playerDestroy(Level *level, std::shared_ptr<Player> player, int x, int y, int z, int data)
|
||||
{
|
||||
int type = Item::snowBall->id;
|
||||
float s = 0.7f;
|
||||
double xo = level->random->nextFloat() * s + (1 - s) * 0.5;
|
||||
double yo = level->random->nextFloat() * s + (1 - s) * 0.5;
|
||||
double zo = level->random->nextFloat() * s + (1 - s) * 0.5;
|
||||
shared_ptr<ItemEntity> item = shared_ptr<ItemEntity>( new ItemEntity(level, x + xo, y + yo, z + zo, shared_ptr<ItemInstance>( new ItemInstance(type, 1, 0) ) ) );
|
||||
std::shared_ptr<ItemEntity> item = std::shared_ptr<ItemEntity>( new ItemEntity(level, x + xo, y + yo, z + zo, std::shared_ptr<ItemInstance>( new ItemInstance(type, 1, 0) ) ) );
|
||||
item->throwTime = 10;
|
||||
level->addEntity(item);
|
||||
level->setTile(x, y, z, 0);
|
||||
|
||||
Reference in New Issue
Block a user