summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/equipment.h14
-rw-r--r--src/net/equipmenthandler.cpp2
2 files changed, 6 insertions, 10 deletions
diff --git a/src/equipment.h b/src/equipment.h
index 4993e4df..28a96baa 100644
--- a/src/equipment.h
+++ b/src/equipment.h
@@ -43,26 +43,22 @@ class Equipment
/**
* Set equipment at the given slot.
*/
- void
- setEquipment(int index, int inventoryIndex);
+ void setEquipment(int index, int inventoryIndex);
/**
* Remove equipment from the given slot.
*/
- void
- removeEquipment(int index) { mEquipment[index] = 0; }
+ void removeEquipment(int index) { mEquipment[index] = 0; }
/**
- * Get the item used in the arrow slot.
+ * Returns the item used in the arrow slot.
*/
- int
- getArrows() { return mArrows; }
+ int getArrows() const { return mArrows; }
/**
* Set the item used in the arrow slot.
*/
- void
- setArrows(int arrows) { mArrows = arrows; }
+ void setArrows(int arrows) { mArrows = arrows; }
private:
int mEquipment[EQUIPMENT_SIZE];
diff --git a/src/net/equipmenthandler.cpp b/src/net/equipmenthandler.cpp
index 39b6e8cd..580cef6b 100644
--- a/src/net/equipmenthandler.cpp
+++ b/src/net/equipmenthandler.cpp
@@ -155,7 +155,7 @@ void EquipmentHandler::handleMessage(MessageIn *msg)
switch (item->getId()) {
case 529:
case 1199:
- player_node->mEquipment->setArrows(NULL);
+ player_node->mEquipment->setArrows(0);
break;
case 521:
case 522: