summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/gui/windows/killstats.cpp9
-rw-r--r--src/gui/windows/ministatuswindow.cpp3
-rw-r--r--src/gui/windows/statuswindow.cpp5
-rw-r--r--src/net/eathena/playerhandler.cpp6
-rw-r--r--src/net/eathena/playerrecv.cpp18
-rw-r--r--src/net/tmwa/playerhandler.cpp6
6 files changed, 31 insertions, 16 deletions
diff --git a/src/gui/windows/killstats.cpp b/src/gui/windows/killstats.cpp
index c745bc151..f3ebbdaa4 100644
--- a/src/gui/windows/killstats.cpp
+++ b/src/gui/windows/killstats.cpp
@@ -161,7 +161,8 @@ void KillStats::action(const ActionEvent &event)
mKillCounter = 0;
mExpCounter = 0;
mLine3->setCaption(strprintf("1%% = %d exp, avg mob for 1%%: %s",
- PlayerInfo::getAttribute(Attributes::PLAYER_EXP_NEEDED) / 100, "?"));
+ PlayerInfo::getAttribute(Attributes::PLAYER_EXP_NEEDED) / 100,
+ "?"));
// TRANSLATORS: kill stats window label
mLine4->setCaption(strprintf(_("Kills: %s, total exp: %s"), "?", "?"));
// TRANSLATORS: kill stats window label
@@ -303,7 +304,8 @@ void KillStats::recalcStats()
if (curTime != 0 && mLastHost == 0xFF6B66 && cur_time > 1)
{
- const int newExp = PlayerInfo::getAttribute(Attributes::PLAYER_EXP_NEEDED);
+ const int newExp = PlayerInfo::getAttribute(
+ Attributes::PLAYER_EXP_NEEDED);
if (m1minExpTime != 0)
m1minSpeed = newExp - m1minExpNum;
mStatsReUpdated = true;
@@ -347,7 +349,8 @@ void KillStats::update()
mExpTime1Label->setCaption(strprintf(_(" Time for next level: %s"),
toString(static_cast<float>((PlayerInfo::getAttribute(
Attributes::PLAYER_EXP_NEEDED) - PlayerInfo::getAttribute(
- Attributes::PLAYER_EXP)) / static_cast<float>(m1minSpeed))).c_str()));
+ Attributes::PLAYER_EXP)) /
+ static_cast<float>(m1minSpeed))).c_str()));
}
else
{
diff --git a/src/gui/windows/ministatuswindow.cpp b/src/gui/windows/ministatuswindow.cpp
index b2d89adef..c9c6248e6 100644
--- a/src/gui/windows/ministatuswindow.cpp
+++ b/src/gui/windows/ministatuswindow.cpp
@@ -365,7 +365,8 @@ void MiniStatusWindow::mouseMoved(MouseEvent &event)
}
const int exp = PlayerInfo::getAttribute(Attributes::PLAYER_EXP);
- const int expNeed = PlayerInfo::getAttribute(Attributes::PLAYER_EXP_NEEDED);
+ const int expNeed = PlayerInfo::getAttribute(
+ Attributes::PLAYER_EXP_NEEDED);
if (exp > expNeed)
{
textPopup->show(x + rect.x, y + rect.y, level, strprintf("%d/%d",
diff --git a/src/gui/windows/statuswindow.cpp b/src/gui/windows/statuswindow.cpp
index 26c7acb39..c762084fd 100644
--- a/src/gui/windows/statuswindow.cpp
+++ b/src/gui/windows/statuswindow.cpp
@@ -121,8 +121,9 @@ StatusWindow::StatusWindow() :
max = PlayerInfo::getAttribute(Attributes::PLAYER_EXP_NEEDED);
mXpBar = new ProgressBar(this,
- max ? static_cast<float>(PlayerInfo::getAttribute(Attributes::PLAYER_EXP))
- / static_cast<float>(max) : static_cast<float>(0),
+ max ?
+ static_cast<float>(PlayerInfo::getAttribute(Attributes::PLAYER_EXP)) /
+ static_cast<float>(max) : static_cast<float>(0),
80,
0,
ProgressColorId::PROG_EXP,
diff --git a/src/net/eathena/playerhandler.cpp b/src/net/eathena/playerhandler.cpp
index 5b7b8baf5..b0edf5c1c 100644
--- a/src/net/eathena/playerhandler.cpp
+++ b/src/net/eathena/playerhandler.cpp
@@ -547,7 +547,8 @@ void PlayerHandler::setStat(Net::MessageIn &msg,
if (m)
{
m->setHp(base);
- m->setMaxHp(PlayerInfo::getAttribute(Attributes::PLAYER_MAX_HP));
+ m->setMaxHp(PlayerInfo::getAttribute(
+ Attributes::PLAYER_MAX_HP));
}
}
break;
@@ -629,7 +630,8 @@ void PlayerHandler::setStat(Net::MessageIn &msg,
// ++ here used in wrong way. Need like Sp::NEXTBASEEXP?
case Sp::NEXTJOBEXP:
PlayerInfo::setStatExperience(Attributes::PLAYER_JOB,
- PlayerInfo::getStatExperience(Attributes::PLAYER_JOB).first, base);
+ PlayerInfo::getStatExperience(Attributes::PLAYER_JOB).first,
+ base);
break;
case Sp::WEIGHT:
PlayerInfo::setAttribute(Attributes::TOTAL_WEIGHT, base);
diff --git a/src/net/eathena/playerrecv.cpp b/src/net/eathena/playerrecv.cpp
index 3c32be745..8f223363c 100644
--- a/src/net/eathena/playerrecv.cpp
+++ b/src/net/eathena/playerrecv.cpp
@@ -151,7 +151,8 @@ void PlayerRecv::processPlayerStatUpdate5(Net::MessageIn &msg)
PlayerInfo::setStatBase(Attributes::PLAYER_ATK,
msg.readInt16("left atk"), Notify_false);
- PlayerInfo::setStatMod(Attributes::PLAYER_ATK, msg.readInt16("right atk"));
+ PlayerInfo::setStatMod(Attributes::PLAYER_ATK,
+ msg.readInt16("right atk"));
PlayerInfo::updateAttrs();
val = msg.readInt16("right matk");
@@ -162,19 +163,24 @@ void PlayerRecv::processPlayerStatUpdate5(Net::MessageIn &msg)
PlayerInfo::setStatBase(Attributes::PLAYER_DEF,
msg.readInt16("left def"), Notify_false);
- PlayerInfo::setStatMod(Attributes::PLAYER_DEF, msg.readInt16("right def"));
+ PlayerInfo::setStatMod(Attributes::PLAYER_DEF,
+ msg.readInt16("right def"));
PlayerInfo::setStatBase(Attributes::PLAYER_MDEF,
msg.readInt16("left mdef"), Notify_false);
- PlayerInfo::setStatMod(Attributes::PLAYER_MDEF, msg.readInt16("right mdef"));
+ PlayerInfo::setStatMod(Attributes::PLAYER_MDEF,
+ msg.readInt16("right mdef"));
- PlayerInfo::setStatBase(Attributes::PLAYER_HIT, msg.readInt16("hit"));
+ PlayerInfo::setStatBase(Attributes::PLAYER_HIT,
+ msg.readInt16("hit"));
PlayerInfo::setStatBase(Attributes::PLAYER_FLEE,
msg.readInt16("flee"), Notify_false);
- PlayerInfo::setStatMod(Attributes::PLAYER_FLEE, msg.readInt16("flee2/10"));
+ PlayerInfo::setStatMod(Attributes::PLAYER_FLEE,
+ msg.readInt16("flee2/10"));
- PlayerInfo::setStatBase(Attributes::PLAYER_CRIT, msg.readInt16("crit/10"));
+ PlayerInfo::setStatBase(Attributes::PLAYER_CRIT,
+ msg.readInt16("crit/10"));
PlayerInfo::setAttribute(Attributes::PLAYER_ATTACK_DELAY,
msg.readInt16("attack speed"));
diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp
index 5058e1d39..dba6f5162 100644
--- a/src/net/tmwa/playerhandler.cpp
+++ b/src/net/tmwa/playerhandler.cpp
@@ -251,7 +251,8 @@ void PlayerHandler::setStat(Net::MessageIn &msg,
if (m)
{
m->setHp(base);
- m->setMaxHp(PlayerInfo::getAttribute(Attributes::PLAYER_MAX_HP));
+ m->setMaxHp(PlayerInfo::getAttribute(
+ Attributes::PLAYER_MAX_HP));
}
}
break;
@@ -332,7 +333,8 @@ void PlayerHandler::setStat(Net::MessageIn &msg,
break;
case Sp::JOB_MOD:
PlayerInfo::setStatExperience(Attributes::PLAYER_JOB,
- PlayerInfo::getStatExperience(Attributes::PLAYER_JOB).first, base);
+ PlayerInfo::getStatExperience(Attributes::PLAYER_JOB).first,
+ base);
break;
case Sp::WEIGHT:
PlayerInfo::setAttribute(Attributes::TOTAL_WEIGHT, base);
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-05 11:04:28 +0000