From 5f9bbd205fec7d66643861a5204c6cc7dec639ba Mon Sep 17 00:00:00 2001
From: Eugenio Favalli <elvenprogrammer@gmail.com>
Date: Sun, 5 Mar 2006 22:33:09 +0000
Subject: Merged new_playerset branch into trunk.

---
 src/localplayer.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'src/localplayer.cpp')

diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 43cf0069..e10fd3d6 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -54,15 +54,20 @@ void LocalPlayer::logic()
 {
     switch (action) {
         case WALK:
-            mFrame = (get_elapsed_time(walk_time) * 4) / mWalkSpeed;
-            if (mFrame >= 4) {
+            mFrame = (get_elapsed_time(walk_time) * 6) / mWalkSpeed;
+            if (mFrame >= 6) {
                 nextStep();
             }
             break;
 
         case ATTACK:
-            mFrame = (get_elapsed_time(walk_time) * 4) / aspd;
-            if (mFrame >= 4) {
+            int frames = 4;
+            if (getWeapon() == 2)
+            {
+                frames = 5;
+            }
+            mFrame = (get_elapsed_time(walk_time) * frames) / aspd;
+            if (mFrame >= frames) {
                 nextStep();
                 attack();
             }
-- 
cgit v1.2.3-70-g09d2