summaryrefslogtreecommitdiff
path: root/src/player.h
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2007-11-20 10:50:00 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2007-11-20 10:50:00 +0000
commit5a7abdafdac8f6ddd7972cadbc7e20563a0a29fc (patch)
tree95684590a32266b28f046475cfa1926c99f67e52 /src/player.h
parentcf36850d2bdda67cb472d938ed58053a92fa6935 (diff)
downloadmana-client-5a7abdafdac8f6ddd7972cadbc7e20563a0a29fc.tar.gz
mana-client-5a7abdafdac8f6ddd7972cadbc7e20563a0a29fc.tar.bz2
mana-client-5a7abdafdac8f6ddd7972cadbc7e20563a0a29fc.tar.xz
mana-client-5a7abdafdac8f6ddd7972cadbc7e20563a0a29fc.zip
Merged revisions 3629-3630 via svnmerge from
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/trunk (but kept looks in Being class, since eAthena works that way) ........ r3629 | gmelquio | 2007-10-18 21:00:38 +0200 (Thu, 18 Oct 2007) | 1 line Removed player looks from generic beings. Prevented client termination on missing sprites. Merged weapon-type and attack-type fields for items. ........ r3630 | gmelquio | 2007-10-18 21:30:57 +0200 (Thu, 18 Oct 2007) | 1 line Fixed changelog message. ........
Diffstat (limited to 'src/player.h')
-rw-r--r--src/player.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/player.h b/src/player.h
index a6bd557c..742ca465 100644
--- a/src/player.h
+++ b/src/player.h
@@ -37,7 +37,7 @@ class Map;
class Player : public Being
{
public:
- Player(Uint32 id, Uint16 job, Map *map);
+ Player(int id, int job, Map *map);
virtual void
logic();
@@ -49,16 +49,16 @@ class Player : public Being
drawName(Graphics *graphics, int offsetX, int offsetY);
virtual void
- setSex(Uint8 sex);
+ setGender(int gender);
virtual void
- setHairColor(Uint16 color);
+ setHairColor(int color);
virtual void
- setHairStyle(Uint16 style);
+ setHairStyle(int style);
virtual void
- setVisibleEquipment(Uint8 slot, int id);
+ setVisibleEquipment(int slot, int id);
};
#endif