summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIra Rice <irarice@gmail.com>2008-11-02 03:06:25 +0000
committerIra Rice <irarice@gmail.com>2008-11-02 03:06:25 +0000
commitda8d03a095ff2ef34f688db8c602c974be956223 (patch)
treee370c32ac9586b3b7586726ce0f3bafd8cb19cf0
parent168eba19e2b4712c8410bd940e3bd1fbba746d1f (diff)
downloadmana-client-da8d03a095ff2ef34f688db8c602c974be956223.tar.gz
mana-client-da8d03a095ff2ef34f688db8c602c974be956223.tar.bz2
mana-client-da8d03a095ff2ef34f688db8c602c974be956223.tar.xz
mana-client-da8d03a095ff2ef34f688db8c602c974be956223.zip
This correctly fixes the attack problem. Apparently, I didn't realize a bit ago that the item type was being used to
determine which attack animation to use, since a comment lied about it not being used.
-rw-r--r--src/being.cpp4
-rw-r--r--src/resources/itemdb.cpp4
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)
{