summaryrefslogtreecommitdiff
path: root/src/gui/charselectdialog.cpp
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2009-07-19 22:05:41 -0600
committerJared Adams <jaxad0127@gmail.com>2009-07-19 22:30:18 -0600
commit5141dc4a99b74358f2dd0f5f211c5069a630ce1b (patch)
tree647cfb05d179d61759ef3679482eb204a7853d34 /src/gui/charselectdialog.cpp
parent2e8fca7d471b4e2bf20735a0669e96722c000669 (diff)
downloadmana-client-5141dc4a99b74358f2dd0f5f211c5069a630ce1b.tar.gz
mana-client-5141dc4a99b74358f2dd0f5f211c5069a630ce1b.tar.bz2
mana-client-5141dc4a99b74358f2dd0f5f211c5069a630ce1b.tar.xz
mana-client-5141dc4a99b74358f2dd0f5f211c5069a630ce1b.zip
Merge StatusWindows
Also some other small merges
Diffstat (limited to 'src/gui/charselectdialog.cpp')
-rw-r--r--src/gui/charselectdialog.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/charselectdialog.cpp b/src/gui/charselectdialog.cpp
index 03371271..1387bce5 100644
--- a/src/gui/charselectdialog.cpp
+++ b/src/gui/charselectdialog.cpp
@@ -36,6 +36,8 @@
#include "gui/changeemaildialog.h"
#include "net/tmwserv/accountserver/account.h"
+#else
+#include "net/ea/protocol.h"
#endif
#include "gui/widgets/button.h"
@@ -296,9 +298,9 @@ void CharSelectDialog::updatePlayerInfo()
mNameLabel->setCaption(strprintf(_("Name: %s"),
pi->getName().c_str()));
mLevelLabel->setCaption(strprintf(_("Level: %d"), pi->getLevel()));
-#ifndef TMWSERV_SUPPORT
+#ifdef EATHENA_SUPPORT
mJobLevelLabel->setCaption(strprintf(_("Job Level: %d"),
- pi->mJobLevel));
+ pi->getAttributeBase(JOB)));
#endif
mMoneyLabel->setCaption(strprintf(_("Money: %s"), mMoney.c_str()));
if (!mCharSelected)