diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-11-20 10:50:00 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-11-20 10:50:00 +0000 |
| commit | 5a7abdafdac8f6ddd7972cadbc7e20563a0a29fc (patch) | |
| tree | 95684590a32266b28f046475cfa1926c99f67e52 /src/being.cpp | |
| parent | cf36850d2bdda67cb472d938ed58053a92fa6935 (diff) | |
| download | mana-5a7abdafdac8f6ddd7972cadbc7e20563a0a29fc.tar.gz mana-5a7abdafdac8f6ddd7972cadbc7e20563a0a29fc.tar.bz2 mana-5a7abdafdac8f6ddd7972cadbc7e20563a0a29fc.tar.xz mana-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/being.cpp')
| -rw-r--r-- | src/being.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/being.cpp b/src/being.cpp index bfd35e21..73c9ed62 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -44,7 +44,7 @@ int Being::instances = 0; ImageSet *Being::emotionSet = NULL; -Being::Being(Uint32 id, Uint16 job, Map *map): +Being::Being(int id, int job, Map *map): mJob(job), mX(0), mY(0), mAction(0), @@ -58,7 +58,7 @@ Being::Being(Uint32 id, Uint16 job, Map *map): mMap(NULL), mEquippedWeapon(NULL), mHairStyle(0), mHairColor(0), - mSex(2), + mGender(2), mSpeechTime(0), mPx(0), mPy(0), mSprites(VECTOREND_SPRITE, NULL), @@ -147,7 +147,7 @@ Being::setHairStyle(Uint16 style) } void -Being::setVisibleEquipment(Uint8 slot, int id) +Being::setVisibleEquipment(int slot, int id) { mEquipmentSpriteIDs[slot] = id; } |