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:
@@ -13,9 +13,9 @@ FireChargeItem::FireChargeItem(int id) : Item(id)
|
||||
m_dragonFireballIcon = NULL;
|
||||
}
|
||||
|
||||
bool FireChargeItem::useOn(shared_ptr<ItemInstance> itemInstance, shared_ptr<Player> player, Level *level, int x, int y, int z, int face, float clickX, float clickY, float clickZ, bool bTestUseOnOnly)
|
||||
bool FireChargeItem::useOn(std::shared_ptr<ItemInstance> itemInstance, std::shared_ptr<Player> player, Level *level, int x, int y, int z, int face, float clickX, float clickY, float clickZ, bool bTestUseOnOnly)
|
||||
{
|
||||
if (level->isClientSide)
|
||||
if (level->isClientSide)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
@@ -27,7 +27,7 @@ bool FireChargeItem::useOn(shared_ptr<ItemInstance> itemInstance, shared_ptr<Pla
|
||||
if (face == 4) x--;
|
||||
if (face == 5) x++;
|
||||
|
||||
if (!player->mayBuild(x, y, z))
|
||||
if (!player->mayBuild(x, y, z))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
@@ -40,13 +40,13 @@ bool FireChargeItem::useOn(shared_ptr<ItemInstance> itemInstance, shared_ptr<Pla
|
||||
|
||||
int targetType = level->getTile(x, y, z);
|
||||
|
||||
if (targetType == 0)
|
||||
if (targetType == 0)
|
||||
{
|
||||
level->playSound( x + 0.5, y + 0.5, z + 0.5,eSoundType_FIRE_IGNITE, 1, random->nextFloat() * 0.4f + 0.8f);
|
||||
level->setTile(x, y, z, Tile::fire_Id);
|
||||
}
|
||||
|
||||
if (!player->abilities.instabuild)
|
||||
if (!player->abilities.instabuild)
|
||||
{
|
||||
itemInstance->count--;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user