summaryrefslogtreecommitdiff
path: root/src/gui/char_select.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2008-04-11 13:31:52 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2008-04-11 13:31:52 +0000
commit4b9e2b6c41e740a3eac10078d5fa4fbc63788bbe (patch)
tree6b8aea437d454de40808a7f1289c264d7bd563e3 /src/gui/char_select.cpp
parentf97ddedaa9672c78147fc13282bd14a5be46eb19 (diff)
downloadmana-4b9e2b6c41e740a3eac10078d5fa4fbc63788bbe.tar.gz
mana-4b9e2b6c41e740a3eac10078d5fa4fbc63788bbe.tar.bz2
mana-4b9e2b6c41e740a3eac10078d5fa4fbc63788bbe.tar.xz
mana-4b9e2b6c41e740a3eac10078d5fa4fbc63788bbe.zip
Ported trunk over to Guichan 0.8.0. Based on merge from 0.0 branch, but because
of quite a bit of GUI differences there were additional changes and probably additional issues. You have been warned. ;) Merged revisions 4045-4049,4051-4059 via svnmerge from https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/branches/0.0 ........ r4045 | b_lindeijer | 2008-04-07 17:23:07 +0200 (Mon, 07 Apr 2008) | 3 lines Upgraded to Guichan 0.8.0 (merge from guichan-0.8 branch, except for gcn::TabbedArea usage) ........ r4059 | b_lindeijer | 2008-04-09 16:25:42 +0200 (Wed, 09 Apr 2008) | 2 lines Fixed problem with row height in shop list box. ........
Diffstat (limited to 'src/gui/char_select.cpp')
-rw-r--r--src/gui/char_select.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index a691f4ec..b2d3b53e 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -323,7 +323,7 @@ CharCreateDialog::CharCreateDialog(Window *parent, int slot):
mFemale->setPosition( 100, 120 );
// Default to a Male character
- mMale->setMarked(true);
+ mMale->setSelected(true);
mMale->setActionEventId("gender");
mFemale->setActionEventId("gender");
@@ -375,13 +375,12 @@ CharCreateDialog::action(const gcn::ActionEvent &event)
mCreateButton->setEnabled(false);
unsigned int genderSelected;
- if( mMale->isMarked() ){
+ if (mMale->isSelected()) {
genderSelected = GENDER_MALE;
} else {
genderSelected = GENDER_FEMALE;
}
-
Net::AccountServer::Account::createCharacter(
getName(),
mPlayer->getHairStyle(),
@@ -418,7 +417,7 @@ CharCreateDialog::action(const gcn::ActionEvent &event)
UpdateSliders();
}
else if (event.getId() == "gender"){
- if( mMale->isMarked() ) {
+ if (mMale->isSelected()) {
mPlayer->setGender(GENDER_MALE);
} else {
mPlayer->setGender(GENDER_FEMALE);