The variable name changed but this didn't cause merge conflicts, so it wasn't caught before.
u16 wear = pointed_object->punch(dir, &toolcap, playersao,
time_from_last_punch);
- bool changed = punchitem.addWear(wear, m_itemdef);
+ bool changed = selected_item.addWear(wear, m_itemdef);
if (changed)
- playersao->setWieldedItem(punchitem);
+ playersao->setWieldedItem(selected_item);
// If the object is a player and its HP changed
if (src_original_hp != pointed_object->getHP() &&