diff options
| author | Howaner <franzi.moos@googlemail.com> | 2014-07-26 13:26:14 +0200 |
|---|---|---|
| committer | Howaner <franzi.moos@googlemail.com> | 2014-07-26 13:26:14 +0200 |
| commit | 4de8f5ca2926068eb855ba19c35de2a63ddebf28 (patch) | |
| tree | 68dc829d31c16278ee5a7f4d63f9ac1fa3831a81 | |
| parent | Merge branch 'master' into Inventory2 (diff) | |
| download | cuberite-4de8f5ca2926068eb855ba19c35de2a63ddebf28.tar cuberite-4de8f5ca2926068eb855ba19c35de2a63ddebf28.tar.gz cuberite-4de8f5ca2926068eb855ba19c35de2a63ddebf28.tar.bz2 cuberite-4de8f5ca2926068eb855ba19c35de2a63ddebf28.tar.lz cuberite-4de8f5ca2926068eb855ba19c35de2a63ddebf28.tar.xz cuberite-4de8f5ca2926068eb855ba19c35de2a63ddebf28.tar.zst cuberite-4de8f5ca2926068eb855ba19c35de2a63ddebf28.zip | |
| -rw-r--r-- | src/Items/ItemHandler.cpp | 6 | ||||
| -rw-r--r-- | src/Items/ItemHandler.h | 2 | ||||
| -rw-r--r-- | src/Items/ItemShears.h | 2 | ||||
| -rw-r--r-- | src/Items/ItemSword.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/Items/ItemHandler.cpp b/src/Items/ItemHandler.cpp index e256fa232..ec86648b3 100644 --- a/src/Items/ItemHandler.cpp +++ b/src/Items/ItemHandler.cpp @@ -335,7 +335,7 @@ void cItemHandler::OnBlockDestroyed(cWorld * a_World, cPlayer * a_Player, const if (!cBlockInfo::IsOneHitDig(Block)) { - a_Player->UseEquippedItem(GetDurabilityLostWithThatAction(dlaBreakBlock)); + a_Player->UseEquippedItem(GetDurabilityLossByAction(dlaBreakBlock)); } } @@ -346,7 +346,7 @@ void cItemHandler::OnBlockDestroyed(cWorld * a_World, cPlayer * a_Player, const void cItemHandler::OnEntityAttack(cPlayer * a_Attacker, cEntity * a_AttackedEntity) { UNUSED(a_AttackedEntity); - a_Attacker->UseEquippedItem(GetDurabilityLostWithThatAction(dlaAttackEntity)); + a_Attacker->UseEquippedItem(GetDurabilityLossByAction(dlaAttackEntity)); } @@ -364,7 +364,7 @@ void cItemHandler::OnFoodEaten(cWorld * a_World, cPlayer * a_Player, cItem * a_I -short cItemHandler::GetDurabilityLostWithThatAction(eDurabilityLostAction a_Action) +short cItemHandler::GetDurabilityLossByAction(eDurabilityLostAction a_Action) { switch (a_Action) { diff --git a/src/Items/ItemHandler.h b/src/Items/ItemHandler.h index 28b1dd13b..1d5f59f3e 100644 --- a/src/Items/ItemHandler.h +++ b/src/Items/ItemHandler.h @@ -64,7 +64,7 @@ public: virtual void OnFoodEaten(cWorld *a_World, cPlayer *a_Player, cItem *a_Item); /** Get the durability lost which the item will get, when a specified action was performed. */ - virtual short GetDurabilityLostWithThatAction(eDurabilityLostAction a_Action); + virtual short GetDurabilityLossByAction(eDurabilityLostAction a_Action); /** Returns the maximum stack size for a given item */ virtual char GetMaxStackSize(void); diff --git a/src/Items/ItemShears.h b/src/Items/ItemShears.h index 8f5d5f385..fa2794df2 100644 --- a/src/Items/ItemShears.h +++ b/src/Items/ItemShears.h @@ -63,7 +63,7 @@ public: } - virtual short GetDurabilityLostWithThatAction(eDurabilityLostAction a_Action) override + virtual short GetDurabilityLossByAction(eDurabilityLostAction a_Action) override { return 0; } diff --git a/src/Items/ItemSword.h b/src/Items/ItemSword.h index 1a17023ef..b90965535 100644 --- a/src/Items/ItemSword.h +++ b/src/Items/ItemSword.h @@ -44,7 +44,7 @@ public: } - virtual short GetDurabilityLostWithThatAction(eDurabilityLostAction a_Action) override + virtual short GetDurabilityLossByAction(eDurabilityLostAction a_Action) override { switch (a_Action) { |