summaryrefslogtreecommitdiff
path: root/src/player.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2008-12-13 15:51:25 +0100
committerBjørn Lindeijer <bjorn@lindeijer.nl>2008-12-13 15:51:25 +0100
commit16106cae769f485908c15ac39d0e017167099a48 (patch)
tree7afaf56eddb2138b528fa46f8f51cc66f7c128bb /src/player.cpp
parent1eba9b1bbd2e2c5a75a71c5592069c73e106015f (diff)
downloadmana-client-16106cae769f485908c15ac39d0e017167099a48.tar.gz
mana-client-16106cae769f485908c15ac39d0e017167099a48.tar.bz2
mana-client-16106cae769f485908c15ac39d0e017167099a48.tar.xz
mana-client-16106cae769f485908c15ac39d0e017167099a48.zip
Moved gender and hair style back to Being
These properties should also apply to NPCs and possibly even monsters in the future.
Diffstat (limited to 'src/player.cpp')
-rw-r--r--src/player.cpp10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/player.cpp b/src/player.cpp
index 648b330a..e24a2d8c 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -35,10 +35,7 @@
#include "gui/gui.h"
Player::Player(int id, int job, Map *map):
- Being(id, job, map),
- mGender(GENDER_UNSPECIFIED),
- mHairStyle(0),
- mHairColor(0)
+ Being(id, job, map)
{
}
@@ -67,7 +64,7 @@ void Player::setGender(Gender gender)
{
if (gender != mGender)
{
- mGender = gender;
+ Being::setGender(gender);
/* Human base sprite. When implementing different races remove this
* line and set the base sprite when setting the race of the player
@@ -92,8 +89,7 @@ void Player::setHairStyle(int style, int color)
color = color < 0 ? mHairColor : color % NR_HAIR_COLORS;
if (style == mHairStyle && color == mHairColor) return;
- mHairStyle = style;
- mHairColor = color;
+ Being::setHairStyle(style, color);
static char const *const colors[NR_HAIR_COLORS] =
{