diff options
Diffstat (limited to 'Minecraft.World/WeaponItem.cpp')
| -rw-r--r-- | Minecraft.World/WeaponItem.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Minecraft.World/WeaponItem.cpp b/Minecraft.World/WeaponItem.cpp index 82b16bde..0dd58d83 100644 --- a/Minecraft.World/WeaponItem.cpp +++ b/Minecraft.World/WeaponItem.cpp @@ -13,7 +13,7 @@ WeaponItem::WeaponItem(int id, const Tier *tier) : Item(id), tier( tier ) damage = 4 + tier->getAttackDamageBonus(); } -float WeaponItem::getDestroySpeed(shared_ptr<ItemInstance> itemInstance, Tile *tile) +float WeaponItem::getDestroySpeed(std::shared_ptr<ItemInstance> itemInstance, Tile *tile) { if (tile->id == Tile::web_Id) { @@ -23,20 +23,20 @@ float WeaponItem::getDestroySpeed(shared_ptr<ItemInstance> itemInstance, Tile *t return 1.5f; } -bool WeaponItem::hurtEnemy(shared_ptr<ItemInstance> itemInstance, shared_ptr<Mob> mob, shared_ptr<Mob> attacker) +bool WeaponItem::hurtEnemy(std::shared_ptr<ItemInstance> itemInstance, std::shared_ptr<Mob> mob, std::shared_ptr<Mob> attacker) { itemInstance->hurt(1, attacker); return true; } -bool WeaponItem::mineBlock(shared_ptr<ItemInstance> itemInstance, Level *level, int tile, int x, int y, int z, shared_ptr<Mob> owner) +bool WeaponItem::mineBlock(std::shared_ptr<ItemInstance> itemInstance, Level *level, int tile, int x, int y, int z, std::shared_ptr<Mob> owner) { // Don't damage weapons if the tile can be destroyed in one hit. if (Tile::tiles[tile]->getDestroySpeed(level, x, y, z) != 0.0) itemInstance->hurt(2, owner); return true; } -int WeaponItem::getAttackDamage(shared_ptr<Entity> entity) +int WeaponItem::getAttackDamage(std::shared_ptr<Entity> entity) { return damage; } @@ -46,17 +46,17 @@ bool WeaponItem::isHandEquipped() return true; } -UseAnim WeaponItem::getUseAnimation(shared_ptr<ItemInstance> itemInstance) +UseAnim WeaponItem::getUseAnimation(std::shared_ptr<ItemInstance> itemInstance) { return UseAnim_block; -} +} -int WeaponItem::getUseDuration(shared_ptr<ItemInstance> itemInstance) +int WeaponItem::getUseDuration(std::shared_ptr<ItemInstance> itemInstance) { return 20 * 60 * 60; // Block for a maximum of one hour! } -shared_ptr<ItemInstance> WeaponItem::use(shared_ptr<ItemInstance> instance, Level *level, shared_ptr<Player> player) +std::shared_ptr<ItemInstance> WeaponItem::use(std::shared_ptr<ItemInstance> instance, Level *level, std::shared_ptr<Player> player) { player->startUsingItem(instance, getUseDuration(instance)); return instance; @@ -77,7 +77,7 @@ const Item::Tier *WeaponItem::getTier() return tier; } -bool WeaponItem::isValidRepairItem(shared_ptr<ItemInstance> source, shared_ptr<ItemInstance> repairItem) +bool WeaponItem::isValidRepairItem(std::shared_ptr<ItemInstance> source, std::shared_ptr<ItemInstance> repairItem) { if (tier->getTierItemId() == repairItem->id) { |