diff options
| -rw-r--r-- | src/being.cpp | 4 | ||||
| -rw-r--r-- | src/resources/itemdb.cpp | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/being.cpp b/src/being.cpp index 5c09218c..7ad83e5e 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -276,6 +276,10 @@ void Being::setAction(Action action) case ATTACK: if (mEquippedWeapon) { + currentAction = mEquippedWeapon->getAttackType(); + } + else + { currentAction = ACTION_ATTACK; } for (int i = 0; i < VECTOREND_SPRITE; i++) diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp index ad9eda01..8b73f646 100644 --- a/src/resources/itemdb.cpp +++ b/src/resources/itemdb.cpp @@ -91,7 +91,7 @@ void ItemDB::load() std::string image = XML::getProperty(node, "image", ""); std::string description = XML::getProperty(node, "description", ""); std::string effect = XML::getProperty(node, "effect", ""); - //int weaponType = XML::getProperty(node, "weapon_type", 0);// Not used by Aethyra + int weaponType = XML::getProperty(node, "weapon_type", 0);// Not used by Aethyra if (id) { @@ -103,7 +103,7 @@ void ItemDB::load() itemInfo->setType(type); itemInfo->setView(view); //itemInfo->setWeight(weight); - //itemInfo->setWeaponType(weaponType); + itemInfo->setWeaponType(weaponType); for_each_xml_child_node(itemChild, node) { |