From 5a7abdafdac8f6ddd7972cadbc7e20563a0a29fc Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer Date: Tue, 20 Nov 2007 10:50:00 +0000 Subject: 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. ........ --- src/gui/char_select.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/gui/char_select.h') diff --git a/src/gui/char_select.h b/src/gui/char_select.h index 00b1c51d..283ecf42 100644 --- a/src/gui/char_select.h +++ b/src/gui/char_select.h @@ -50,7 +50,7 @@ class CharSelectDialog : public Window, public gcn::ActionListener */ CharSelectDialog(Network *network, LockedArray *charInfo, - unsigned char sex); + unsigned char gender); void action(const gcn::ActionEvent &event); @@ -78,7 +78,7 @@ class CharSelectDialog : public Window, public gcn::ActionListener PlayerBox *mPlayerBox; - unsigned char mSex; + unsigned char mGender; bool mCharSelected; /** @@ -104,7 +104,7 @@ class CharCreateDialog : public Window, public gcn::ActionListener * Constructor. */ CharCreateDialog(Window *parent, int slot, Network *network, - unsigned char sex); + unsigned char gender); /** * Destructor. -- cgit v1.2.3-70-g09d2