From 36aee3039d377eba9cd73f539d317946e1b76dff Mon Sep 17 00:00:00 2001 From: Eugenio Favalli Date: Mon, 24 Jul 2006 10:36:36 +0000 Subject: Removed unused code, fixed "change direction when not walking" bug, updated project files. --- src/being.cpp | 15 --------------- src/being.h | 6 ------ src/localplayer.cpp | 6 ++++++ 3 files changed, 6 insertions(+), 21 deletions(-) (limited to 'src') diff --git a/src/being.cpp b/src/being.cpp index 437023d4..69057c09 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -124,21 +124,6 @@ Being::setHairStyle(Uint16 style) } } -void -Being::setHair(Uint16 style, Uint16 color) -{ - mHairStyle = style; - if (mHairStyle < 1 || mHairStyle > NR_HAIR_STYLES) - { - mHairStyle = 1; - } - mHairColor = color; - if (mHairColor < 1 || mHairColor > NR_HAIR_COLORS + 1) - { - mHairColor = 1; - } -} - void Being::setVisibleEquipment(Uint8 slot, Uint8 id) { diff --git a/src/being.h b/src/being.h index 6d2bada6..41c9103d 100644 --- a/src/being.h +++ b/src/being.h @@ -185,12 +185,6 @@ class Being : public Sprite Uint16 getHairStyle() const { return mHairStyle; } - /** - * Sets the hair style and color for this being. - */ - virtual void - setHair(Uint16 style, Uint16 color); - /** * Sets visible equipments for this being. */ diff --git a/src/localplayer.cpp b/src/localplayer.cpp index 339435a5..8b601326 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -210,6 +210,9 @@ void LocalPlayer::walk(unsigned char dir) { // Update the player direction to where he wants to walk // Warning: Not communicated to the server yet + + // If the being can't move, just change direction + mDirection = dir; setDirection(dir); } } @@ -344,7 +347,10 @@ void LocalPlayer::attack(Being *target, bool keep) if (abs(dist_y) >= abs(dist_x)) { if (dist_y > 0) + { setDirection(DOWN); + printf("DOWN\n"); + } else setDirection(UP); } -- cgit v1.2.3-70-g09d2