summaryrefslogtreecommitdiff
path: root/src/gui/windows
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-09-29 18:40:47 +0300
committerAndrei Karas <akaras@inbox.ru>2017-09-29 18:40:47 +0300
commit158e2b5eb03ae01bf5c49f87292bf7aca8ae749b (patch)
treed6aa6fc7edcdc19b8edf1222bb85b047710e94f5 /src/gui/windows
parent12b83ad925ecc0b6416a12a9f83757fbd1f04d79 (diff)
downloadmv-158e2b5eb03ae01bf5c49f87292bf7aca8ae749b.tar.gz
mv-158e2b5eb03ae01bf5c49f87292bf7aca8ae749b.tar.bz2
mv-158e2b5eb03ae01bf5c49f87292bf7aca8ae749b.tar.xz
mv-158e2b5eb03ae01bf5c49f87292bf7aca8ae749b.zip
Fix code style.
Diffstat (limited to 'src/gui/windows')
-rw-r--r--src/gui/windows/killstats.cpp11
-rw-r--r--src/gui/windows/killstats.h2
-rw-r--r--src/gui/windows/ministatuswindow.cpp1
3 files changed, 8 insertions, 6 deletions
diff --git a/src/gui/windows/killstats.cpp b/src/gui/windows/killstats.cpp
index 1b83b1001..80efb4b36 100644
--- a/src/gui/windows/killstats.cpp
+++ b/src/gui/windows/killstats.cpp
@@ -295,7 +295,7 @@ void KillStats::gainXp(int64_t xp)
// TRANSLATORS: kill stats window label
mLine7->setCaption(strprintf(_("Kills/Min: %s, Exp/Min: %s"),
toString(mKillTCounter / timeDiff).c_str(),
- toString(mExpTCounter / timeDiff).c_str()));
+ toString(CAST_U64(mExpTCounter / timeDiff)).c_str()));
mLastKillExpLabel->setCaption(strprintf("%s %s",
// TRANSLATORS: kill stats window label
@@ -314,7 +314,8 @@ void KillStats::recalcStats()
// Need Update Exp Counter
if (curTime - m1minExpTime > 60)
{
- const int64_t newExp = PlayerInfo::getAttribute(Attributes::PLAYER_EXP);
+ const int64_t newExp = PlayerInfo::getAttribute(
+ Attributes::PLAYER_EXP);
if (m1minExpTime != 0)
m1minSpeed = CAST_S32(newExp - m1minExpNum);
else
@@ -335,7 +336,8 @@ void KillStats::recalcStats()
if (curTime - m5minExpTime > 60*5)
{
- const int64_t newExp = PlayerInfo::getAttribute(Attributes::PLAYER_EXP);
+ const int64_t newExp = PlayerInfo::getAttribute(
+ Attributes::PLAYER_EXP);
if (m5minExpTime != 0)
m5minSpeed = CAST_S32(newExp - m5minExpNum);
else
@@ -346,7 +348,8 @@ void KillStats::recalcStats()
if (curTime - m15minExpTime > 60*15)
{
- const int64_t newExp = PlayerInfo::getAttribute(Attributes::PLAYER_EXP);
+ const int64_t newExp = PlayerInfo::getAttribute(
+ Attributes::PLAYER_EXP);
if (m15minExpTime != 0)
m15minSpeed = CAST_S32(newExp - m15minExpNum);
else
diff --git a/src/gui/windows/killstats.h b/src/gui/windows/killstats.h
index a57c5c439..c701d8430 100644
--- a/src/gui/windows/killstats.h
+++ b/src/gui/windows/killstats.h
@@ -96,7 +96,7 @@ class KillStats final : public Window,
int mKillCounter; /**< Session Kill counter. */
int64_t mExpCounter; /**< Session Exp counter. */
int mKillTCounter; /**< Timer Kill counter. */
- int mExpTCounter; /**< Timer Exp counter. */
+ int64_t mExpTCounter; /**< Timer Exp counter. */
time_t m1minExpTime;
int64_t m1minExpNum;
diff --git a/src/gui/windows/ministatuswindow.cpp b/src/gui/windows/ministatuswindow.cpp
index 212906861..e596f1fae 100644
--- a/src/gui/windows/ministatuswindow.cpp
+++ b/src/gui/windows/ministatuswindow.cpp
@@ -415,7 +415,6 @@ void MiniStatusWindow::mouseMoved(MouseEvent &event)
Attributes::PLAYER_JOB_LEVEL);
const std::string expStr = toString(CAST_U64(exp));
const std::string expNeedStr = toString(CAST_U64(expNeed));
- const std::string jobLevelStr = toString(CAST_U64(jobLevel));
const std::string expLeftStr = toString(CAST_U64(expNeed - exp));
// TRANSLATORS: job bar label