1 files changed, 21 insertions, 9 deletions

diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index f88736c1..aaf4e8c4 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -1,9 +1,8 @@
 /*
- *  Aethyra
+ *  The Mana World
  *  Copyright (C) 2004  The Mana World Development Team
  *
- *  This file is part of Aethyra based on original code
- *  from The Mana World.
+ *  This file is part of The Mana World.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -37,6 +36,7 @@
 #include "../game.h"
 #include "../localplayer.h"
 #include "../main.h"
+#include "../units.h"
 
 #include "../net/charserverhandler.h"
 #include "../net/messageout.h"
@@ -85,6 +85,10 @@ CharSelectDialog::CharSelectDialog(Network *network,
     Window(_("Select Character")), mNetwork(network),
     mCharInfo(charInfo), mGender(gender), mCharSelected(false)
 {
+    mCharInfo->select(0);
+    LocalPlayer *pi = mCharInfo->getEntry();
+    if (pi)
+        mMoney = Units::formatCurrency(pi->mGp);
     // Control that shows the Player
     mPlayerBox = new PlayerBox;
     mPlayerBox->setWidth(74);
@@ -92,7 +96,7 @@ CharSelectDialog::CharSelectDialog(Network *network,
     mNameLabel = new Label(strprintf(_("Name: %s"), ""));
     mLevelLabel = new Label(strprintf(_("Level: %d"), 0));
     mJobLevelLabel = new Label(strprintf(_("Job Level: %d"), 0));
-    mMoneyLabel = new Label(strprintf(_("Money: %d"), 0));
+    mMoneyLabel = new Label(strprintf(_("Money: %s"), mMoney.c_str()));
 
     const std::string tempString = getFont()->getWidth(_("New")) <
                                    getFont()->getWidth(_("Delete")) ?
@@ -122,7 +126,7 @@ CharSelectDialog::CharSelectDialog(Network *network,
 
     reflowLayout(250, 0);
 
-    setLocationRelativeTo(getParent());
+    center();
     setVisible(true);
     mSelectButton->requestFocus();
     updatePlayerInfo();
@@ -163,10 +167,16 @@ void CharSelectDialog::action(const gcn::ActionEvent &event)
     else if (event.getId() == "previous")
     {
         mCharInfo->prev();
+        LocalPlayer *pi = mCharInfo->getEntry();
+        if (pi)
+            mMoney = Units::formatCurrency(pi->mGp);
     }
     else if (event.getId() == "next")
     {
         mCharInfo->next();
+        LocalPlayer *pi = mCharInfo->getEntry();
+        if (pi)
+            mMoney = Units::formatCurrency(pi->mGp);
     }
 }
 
@@ -176,10 +186,12 @@ void CharSelectDialog::updatePlayerInfo()
 
     if (pi)
     {
-        mNameLabel->setCaption(strprintf(_("Name: %s"), pi->getName().c_str()));
+        mNameLabel->setCaption(strprintf(_("Name: %s"),
+                                          pi->getName().c_str()));
         mLevelLabel->setCaption(strprintf(_("Level: %d"), pi->mLevel));
-        mJobLevelLabel->setCaption(strprintf(_("Job Level: %d"), pi->mJobLevel));
-        mMoneyLabel->setCaption(strprintf(_("Gold: %d"), pi->mGp));
+        mJobLevelLabel->setCaption(strprintf(_("Job Level: %d"),
+                                              pi->mJobLevel));
+        mMoneyLabel->setCaption(strprintf(_("Money: %s"), mMoney.c_str()));
         if (!mCharSelected)
         {
             mNewDelCharButton->setCaption(_("Delete"));
@@ -293,7 +305,7 @@ CharCreateDialog::CharCreateDialog(Window *parent, int slot, Network *network,
 
     reflowLayout(225, 0);
 
-    setLocationRelativeTo(getParent());
+    center();
     setVisible(true);
     mNameField->requestFocus();
 }