summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2010-07-30 01:02:25 +0200
committerYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2010-07-30 01:17:17 +0200
commit4cbbfeca46c60fc0efdfe901e69324cd8358308e (patch)
tree199c96c8ef80dd37cdb6a66124f6f17b4e6945e6 /src
parent5711dc9a0c1952f2d523bc6c6106d8ef3b47a201 (diff)
downloadmana-4cbbfeca46c60fc0efdfe901e69324cd8358308e.tar.gz
mana-4cbbfeca46c60fc0efdfe901e69324cd8358308e.tar.bz2
mana-4cbbfeca46c60fc0efdfe901e69324cd8358308e.tar.xz
mana-4cbbfeca46c60fc0efdfe901e69324cd8358308e.zip
Fixed weapon animations for manaserv.
The beinghandler didn't tell to the being::setSprite() function if the equipment was a weapon or not. Resolves: Manasource-Mantis #157. Reviewed-by: Jaxad0127.
Diffstat (limited to 'src')
-rw-r--r--src/localplayer.cpp1
-rw-r--r--src/net/manaserv/beinghandler.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 97694b7c..f8d0ae0e 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -914,6 +914,7 @@ void LocalPlayer::attack(Being *target, bool keep)
mLastTarget = -1;
setTarget(target);
}
+
if (Net::getNetworkType() == ServerInfo::MANASERV)
{
Vector plaPos = this->getPosition();
diff --git a/src/net/manaserv/beinghandler.cpp b/src/net/manaserv/beinghandler.cpp
index f499ff0a..63c1e13f 100644
--- a/src/net/manaserv/beinghandler.cpp
+++ b/src/net/manaserv/beinghandler.cpp
@@ -144,7 +144,7 @@ static void handleLooks(Being *being, Net::MessageIn &msg)
{
if (!(mask & (1 << i))) continue;
int id = msg.readInt16();
- being->setSprite(slots[i], id);
+ being->setSprite(slots[i], id,"", (slots[i] == SPRITE_WEAPON));
}
}