summaryrefslogtreecommitdiff
path: root/src/equipment.cpp
diff options
context:
space:
mode:
authorBjörn Steinbrink <B.Steinbrink@gmx.de>2006-01-22 13:31:13 +0000
committerBjörn Steinbrink <B.Steinbrink@gmx.de>2006-01-22 13:31:13 +0000
commitbd56bf8afdab16383ed8ad08412a8c807f84af85 (patch)
tree0e963ada63bcbe3c50dd77986aaa15b9ba49816a /src/equipment.cpp
parent5359640b6f271af31f6423df9d661433eff89a3e (diff)
downloadmana-bd56bf8afdab16383ed8ad08412a8c807f84af85.tar.gz
mana-bd56bf8afdab16383ed8ad08412a8c807f84af85.tar.bz2
mana-bd56bf8afdab16383ed8ad08412a8c807f84af85.tar.xz
mana-bd56bf8afdab16383ed8ad08412a8c807f84af85.zip
Merged NETWORK branch (includes BEING_OVERHAUL).
Diffstat (limited to 'src/equipment.cpp')
-rw-r--r--src/equipment.cpp18
1 files changed, 6 insertions, 12 deletions
diff --git a/src/equipment.cpp b/src/equipment.cpp
index 85b5eda3..cdbe387c 100644
--- a/src/equipment.cpp
+++ b/src/equipment.cpp
@@ -24,8 +24,6 @@
#include "equipment.h"
#include "item.h"
-Equipment *Equipment::mInstance = NULL;
-
Equipment::Equipment():
mArrows(NULL)
{
@@ -39,16 +37,6 @@ Equipment::~Equipment()
{
}
-Equipment*
-Equipment::getInstance()
-{
- if (!mInstance) {
- mInstance = new Equipment();
- }
-
- return mInstance;
-}
-
void
Equipment::removeEquipment(Item *item)
{
@@ -59,3 +47,9 @@ Equipment::removeEquipment(Item *item)
}
}
}
+
+void Equipment::setEquipment(int index, Item *item)
+{
+ mEquipment[index] = item;
+ item->setEquipped(true);
+}