diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2006-11-05 15:22:13 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2006-11-05 15:22:13 +0000 |
| commit | 6374ef220d8f46647190074338f868b5d6bb4a45 (patch) | |
| tree | a833453c2e712c3e992f71433f6d21c8c379ad15 /src/being.cpp | |
| parent | de61b658590630cfc59960c012c8e533b361a8b0 (diff) | |
| download | mana-6374ef220d8f46647190074338f868b5d6bb4a45.tar.gz mana-6374ef220d8f46647190074338f868b5d6bb4a45.tar.bz2 mana-6374ef220d8f46647190074338f868b5d6bb4a45.tar.xz mana-6374ef220d8f46647190074338f868b5d6bb4a45.zip | |
Merged 0.0 changes from revision 2800 to 2825 to trunk.
Diffstat (limited to 'src/being.cpp')
| -rw-r--r-- | src/being.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/being.cpp b/src/being.cpp index fa24ad69..50a2dc35 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -321,6 +321,9 @@ Being::setAction(Uint8 action) else { switch (getWeapon()) { + case 3: + currentAction = ACTION_ATTACK; + break; case 2: currentAction = ACTION_ATTACK_BOW; break; @@ -565,12 +568,17 @@ 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 @@ -578,6 +586,10 @@ Being::setWeaponById(Uint16 weapon) break; case 521: // sharp knife + /* UNCOMMENT TO TEST SHARP KNIFE AS SCYTHE + * setWeapon(3) + * break; + */ case 522: // dagger case 536: // short sword case 1201: // knife |