Fix number of tool uses being off by 1..32767 (#11110)

[dragonfireclient.git] / src / tool.h

diff --git a/src/tool.h b/src/tool.h
index 59dd501f51de3a75b0694ff42cf47cf6c18df6cd..0e3388485113ec5c28fb5409bea61c463ca32784 100644 (file)
--- a/src/tool.h
+++ b/src/tool.h
@@ -88,10 +88,10 @@ struct DigParams
        // Digging time in seconds
        float time;
        // Caused wear
-       u16 wear;
+       u32 wear; // u32 because wear could be 65536 (single-use tool)
        std::string main_group;
 
-       DigParams(bool a_diggable = false, float a_time = 0.0f, u16 a_wear = 0,
+       DigParams(bool a_diggable = false, float a_time = 0.0f, u32 a_wear = 0,
                        const std::string &a_main_group = ""):
                diggable(a_diggable),
                time(a_time),
@@ -101,21 +101,24 @@ struct DigParams
 };
 
 DigParams getDigParams(const ItemGroupList &groups,
-               const ToolCapabilities *tp);
+               const ToolCapabilities *tp,
+               const u16 initial_wear = 0);
 
 struct HitParams
 {
        s16 hp;
-       u16 wear;
+       // Caused wear
+       u32 wear; // u32 because wear could be 65536 (single-use weapon)
 
-       HitParams(s16 hp_ = 0, u16 wear_ = 0):
+       HitParams(s16 hp_ = 0, u32 wear_ = 0):
                hp(hp_),
                wear(wear_)
        {}
 };
 
 HitParams getHitParams(const ItemGroupList &armor_groups,
-               const ToolCapabilities *tp, float time_from_last_punch);
+               const ToolCapabilities *tp, float time_from_last_punch,
+               u16 initial_wear = 0);
 
 HitParams getHitParams(const ItemGroupList &armor_groups,
                const ToolCapabilities *tp);
@@ -135,7 +138,8 @@ PunchDamageResult getPunchDamage(
                const ItemGroupList &armor_groups,
                const ToolCapabilities *toolcap,
                const ItemStack *punchitem,
-               float time_from_last_punch
+               float time_from_last_punch,
+               u16 initial_wear = 0
 );
 
 f32 getToolRange(const ItemDefinition &def_selected, const ItemDefinition &def_hand);