diff options
author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-09 22:30:00 +0100 |
---|---|---|
committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-09 22:31:11 +0100 |
commit | 07f7d52f661a74e6d0c780ca53e724651e3dcc48 (patch) | |
tree | b55b8c0d04a1544ace42f00642adfde4ad045d94 /src/gui/char_select.cpp | |
parent | 6c29cfa167820635ea602b5cc31dcfeb7b04478c (diff) | |
download | mana-07f7d52f661a74e6d0c780ca53e724651e3dcc48.tar.gz mana-07f7d52f661a74e6d0c780ca53e724651e3dcc48.tar.bz2 mana-07f7d52f661a74e6d0c780ca53e724651e3dcc48.tar.xz mana-07f7d52f661a74e6d0c780ca53e724651e3dcc48.zip |
Mostly whitespace fixes
Removed tab characters and trailing spaces and added spaces between
"if(", "for(", "while(" and "switch(".
Diffstat (limited to 'src/gui/char_select.cpp')
-rw-r--r-- | src/gui/char_select.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp index e556dfa0..dcb05aa1 100644 --- a/src/gui/char_select.cpp +++ b/src/gui/char_select.cpp @@ -91,8 +91,8 @@ CharSelectDialog::CharSelectDialog(Network *network, mJobLevelLabel = new gcn::Label(strprintf(_("Job Level: %d"), 0)); mMoneyLabel = new gcn::Label(strprintf(_("Money: %d"), 0)); - const std::string tempString = getFont()->getWidth(_("New")) < - getFont()->getWidth(_("Delete")) ? + const std::string tempString = getFont()->getWidth(_("New")) < + getFont()->getWidth(_("Delete")) ? _("Delete") : _("New"); mPreviousButton = new Button(_("Previous"), "previous", this); @@ -228,7 +228,7 @@ bool CharSelectDialog::selectByName(const std::string &name) unsigned int oldPos = mCharInfo->getPos(); mCharInfo->select(0); - do + do { LocalPlayer *player = mCharInfo->getEntry(); @@ -306,15 +306,15 @@ CharCreateDialog::~CharCreateDialog() void CharCreateDialog::action(const gcn::ActionEvent &event) { int numberOfColors = ColorDB::size(); - if (event.getId() == "create") + if (event.getId() == "create") { - if (getName().length() >= 4) + if (getName().length() >= 4) { // Attempt to create the character mCreateButton->setEnabled(false); attemptCharCreate(); } - else + else { new OkDialog("Error", "Your name needs to be at least 4 characters.", this); @@ -323,18 +323,18 @@ void CharCreateDialog::action(const gcn::ActionEvent &event) else if (event.getId() == "cancel") scheduleDelete(); else if (event.getId() == "nextcolor") - mPlayer->setHairStyle(mPlayer->getHairStyle(), + mPlayer->setHairStyle(mPlayer->getHairStyle(), (mPlayer->getHairColor() + 1) % numberOfColors); else if (event.getId() == "prevcolor") - mPlayer->setHairStyle(mPlayer->getHairStyle(), - (mPlayer->getHairColor() + numberOfColors - 1) % + mPlayer->setHairStyle(mPlayer->getHairStyle(), + (mPlayer->getHairColor() + numberOfColors - 1) % numberOfColors); else if (event.getId() == "nextstyle") - mPlayer->setHairStyle(mPlayer->getHairStyle() + 1, + mPlayer->setHairStyle(mPlayer->getHairStyle() + 1, mPlayer->getHairColor()); else if (event.getId() == "prevstyle") - mPlayer->setHairStyle(mPlayer->getHairStyle() + - mPlayer->getNumOfHairstyles() - 1, + mPlayer->setHairStyle(mPlayer->getHairStyle() + + mPlayer->getNumOfHairstyles() - 1, mPlayer->getHairColor()); } |