summaryrefslogtreecommitdiff
path: root/src/gui/windows
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/windows')
-rw-r--r--src/gui/windows/chatwindow.cpp2
-rw-r--r--src/gui/windows/ministatuswindow.cpp7
-rw-r--r--src/gui/windows/statuswindow.cpp8
3 files changed, 8 insertions, 9 deletions
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp
index 7b497e747..559c87704 100644
--- a/src/gui/windows/chatwindow.cpp
+++ b/src/gui/windows/chatwindow.cpp
@@ -920,7 +920,7 @@ void ChatWindow::statChanged(const int id,
if (!mShowBattleEvents || !config.getBoolValue("showJobExp"))
return;
- if (id != playerHandler->getJobLocation())
+ if (id != Attributes::JOB)
return;
const std::pair<int, int> exp = PlayerInfo::getStatExperience(id);
diff --git a/src/gui/windows/ministatuswindow.cpp b/src/gui/windows/ministatuswindow.cpp
index dcf60d021..40d4c1124 100644
--- a/src/gui/windows/ministatuswindow.cpp
+++ b/src/gui/windows/ministatuswindow.cpp
@@ -121,7 +121,7 @@ MiniStatusWindow::MiniStatusWindow() :
if (gameHandler->canUseMagicBar() && statusWindow)
statusWindow->updateMPBar(mMpBar);
- const int job = playerHandler->getJobLocation()
+ const int job = Attributes::JOB
&& serverConfig.getValueBool("showJob", true);
StatusWindow::updateXPBar(mXpBar);
@@ -382,12 +382,11 @@ void MiniStatusWindow::mouseMoved(MouseEvent &event)
else if (event.getSource() == mJobBar)
{
const std::pair<int, int> exp = PlayerInfo::getStatExperience(
- playerHandler->getJobLocation());
+ Attributes::JOB);
// TRANSLATORS: job bar label
const std::string level = strprintf(_("Job level: %d"),
- PlayerInfo::getStatBase(
- playerHandler->getJobLocation()));
+ PlayerInfo::getStatBase(Attributes::JOB));
if (exp.first > exp.second)
{
diff --git a/src/gui/windows/statuswindow.cpp b/src/gui/windows/statuswindow.cpp
index b2825c1e7..227528b20 100644
--- a/src/gui/windows/statuswindow.cpp
+++ b/src/gui/windows/statuswindow.cpp
@@ -128,8 +128,8 @@ StatusWindow::StatusWindow() :
getThemeColor(Theme::XP_BAR_OUTLINE));
const bool magicBar = gameHandler->canUseMagicBar();
- const int job = playerHandler->getJobLocation()
- && serverConfig.getValueBool("showJob", true);
+ const int job = Attributes::JOB
+ && serverConfig.getValueBool("showJob", true);
if (magicBar)
{
@@ -264,7 +264,7 @@ void StatusWindow::statChanged(const int id,
if (blocked)
return;
- if (id == playerHandler->getJobLocation())
+ if (id == Attributes::JOB)
{
if (mJobLvlLabel)
{
@@ -522,7 +522,7 @@ void StatusWindow::updateJobBar(ProgressBar *const bar, const bool percent)
return;
const std::pair<int, int> exp = PlayerInfo::getStatExperience(
- playerHandler->getJobLocation());
+ Attributes::JOB);
updateProgressBar(bar, exp.first, exp.second, percent);
}