summaryrefslogtreecommitdiff
path: root/src/being.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/being.cpp')
-rw-r--r--src/being.cpp14
1 files changed, 13 insertions, 1 deletions
diff --git a/src/being.cpp b/src/being.cpp
index dd0554cc..bf85b6e5 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -180,6 +180,9 @@ Being::setAction(Uint8 action)
else {
switch (getWeapon())
{
+ case 3:
+ currentAction = ACTION_ATTACK;
+ break;
case 2:
currentAction = ACTION_ATTACK_BOW;
break;
@@ -414,19 +417,28 @@ Being::getType() const
void
Being::setWeaponById(Uint16 weapon)
{
+ //TODO: Use an external file to map weapon IDs to weapon types
switch (weapon)
{
case 529: // iron arrows
case 1199: // arrows
break;
+ case 623: //scythe
+ setWeapon(3);
+ break;
+
case 1200: // bow
case 530: // short bow
case 545: // forest bow
setWeapon(2);
break;
- case 521: // sharp knife
+ case 521: // sharp knive
+ /* UNCOMMENT TO TEST SHARP KNIVE AS SCYTHE
+ * setWeapon(3)
+ * break;
+ */
case 522: // dagger
case 536: // short sword
case 1201: // knife