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.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/gui/char_select.cpp') diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp index fe260561..90dd53be 100644 --- a/src/gui/char_select.cpp +++ b/src/gui/char_select.cpp @@ -76,9 +76,9 @@ void CharDeleteConfirm::action(const gcn::ActionEvent &event) CharSelectDialog::CharSelectDialog(Network *network, LockedArray *charInfo, - unsigned char sex): + unsigned char gender): Window("Select Character"), mNetwork(network), - mCharInfo(charInfo), mSex(sex), mCharSelected(false) + mCharInfo(charInfo), mGender(gender), mCharSelected(false) { mSelectButton = new Button("Ok", "ok", this); mCancelButton = new Button("Cancel", "cancel", this); @@ -153,7 +153,7 @@ void CharSelectDialog::action(const gcn::ActionEvent &event) { // Start new character dialog CharCreateDialog *charCreateDialog = - new CharCreateDialog(this, mCharInfo->getPos(), mNetwork, mSex); + new CharCreateDialog(this, mCharInfo->getPos(), mNetwork, mGender); charServerHandler.setCharCreateDialog(charCreateDialog); } else if (event.getId() == "delete") @@ -251,11 +251,11 @@ bool CharSelectDialog::selectByName(const std::string &name) } CharCreateDialog::CharCreateDialog(Window *parent, int slot, Network *network, - unsigned char sex): + unsigned char gender): Window("Create Character", true, parent), mNetwork(network), mSlot(slot) { mPlayer = new Player(0, 0, NULL); - mPlayer->setSex(sex); + mPlayer->setGender(gender); mPlayer->setHairStyle(rand() % NR_HAIR_STYLES + 1); mPlayer->setHairColor(rand() % NR_HAIR_COLORS + 1); -- cgit v1.2.3-70-g09d2