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:
@@ -14,27 +14,27 @@ DiggerItem::DiggerItem(int id, int attackDamage, const Tier *tier, TileArray *ti
|
||||
this->attackDamage = attackDamage + tier->getAttackDamageBonus();
|
||||
}
|
||||
|
||||
float DiggerItem::getDestroySpeed(shared_ptr<ItemInstance> itemInstance, Tile *tile)
|
||||
float DiggerItem::getDestroySpeed(std::shared_ptr<ItemInstance> itemInstance, Tile *tile)
|
||||
{
|
||||
for (unsigned int i = 0; i < tiles->length; i++)
|
||||
if ( (*tiles)[i] == tile) return speed;
|
||||
return 1;
|
||||
}
|
||||
|
||||
bool DiggerItem::hurtEnemy(shared_ptr<ItemInstance> itemInstance, shared_ptr<Mob> mob, shared_ptr<Mob> attacker)
|
||||
bool DiggerItem::hurtEnemy(std::shared_ptr<ItemInstance> itemInstance, std::shared_ptr<Mob> mob, std::shared_ptr<Mob> attacker)
|
||||
{
|
||||
itemInstance->hurt(2, attacker);
|
||||
return true;
|
||||
}
|
||||
|
||||
bool DiggerItem::mineBlock(shared_ptr<ItemInstance> itemInstance, Level *level, int tile, int x, int y, int z, shared_ptr<Mob> owner)
|
||||
bool DiggerItem::mineBlock(std::shared_ptr<ItemInstance> itemInstance, Level *level, int tile, int x, int y, int z, std::shared_ptr<Mob> owner)
|
||||
{
|
||||
// Don't damage tools if the tile can be destroyed in one hit.
|
||||
if (Tile::tiles[tile]->getDestroySpeed(level, x, y, z) != 0.0) itemInstance->hurt(1, owner);
|
||||
return true;
|
||||
}
|
||||
|
||||
int DiggerItem::getAttackDamage(shared_ptr<Entity> entity)
|
||||
int DiggerItem::getAttackDamage(std::shared_ptr<Entity> entity)
|
||||
{
|
||||
return attackDamage;
|
||||
}
|
||||
@@ -54,7 +54,7 @@ const Item::Tier *DiggerItem::getTier()
|
||||
return tier;
|
||||
}
|
||||
|
||||
bool DiggerItem::isValidRepairItem(shared_ptr<ItemInstance> source, shared_ptr<ItemInstance> repairItem)
|
||||
bool DiggerItem::isValidRepairItem(std::shared_ptr<ItemInstance> source, std::shared_ptr<ItemInstance> repairItem)
|
||||
{
|
||||
if (tier->getTierItemId() == repairItem->id)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user