summaryrefslogtreecommitdiff
path: root/src/net/tmwa
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-10-01 17:11:12 +0300
committerAndrei Karas <akaras@inbox.ru>2014-10-01 19:28:09 +0300
commit1b9ea6d00c6923abe1da37833e7772d5a5e34b6d (patch)
treea4c4da9f46f171dfd559a10d7fb673164cd03e59 /src/net/tmwa
parente6eef288f86dcc16aa2b5ba20c9079ead78f17e2 (diff)
downloadmanaverse-1b9ea6d00c6923abe1da37833e7772d5a5e34b6d.tar.gz
manaverse-1b9ea6d00c6923abe1da37833e7772d5a5e34b6d.tar.bz2
manaverse-1b9ea6d00c6923abe1da37833e7772d5a5e34b6d.tar.xz
manaverse-1b9ea6d00c6923abe1da37833e7772d5a5e34b6d.zip
Move LUK stat from net enum into attributes.
Diffstat (limited to 'src/net/tmwa')
-rw-r--r--src/net/tmwa/attrs.h3
-rw-r--r--src/net/tmwa/generalhandler.cpp3
-rw-r--r--src/net/tmwa/playerhandler.cpp11
3 files changed, 10 insertions, 7 deletions
diff --git a/src/net/tmwa/attrs.h b/src/net/tmwa/attrs.h
index 7009e6400..0377d10cd 100644
--- a/src/net/tmwa/attrs.h
+++ b/src/net/tmwa/attrs.h
@@ -33,8 +33,7 @@ namespace TmwAthena
AGI,
VIT,
INT,
- DEX,
- LUK
+ DEX
};
} // namespace TmwAthena
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index 5107e873d..d246d1980 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -315,8 +315,7 @@ void GeneralHandler::gameStarted() const
// TRANSLATORS: player stat
statusWindow->addAttribute(DEX, _("Dexterity"), "dex", true);
// TRANSLATORS: player stat
- statusWindow->addAttribute(LUK, _("Luck"), "luk", true);
-
+ statusWindow->addAttribute(Attributes::LUK, _("Luck"), "luk", true);
// TRANSLATORS: player stat
statusWindow->addAttribute(Attributes::ATK, _("Attack"));
// TRANSLATORS: player stat
diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp
index f94dabfc2..217d7aff8 100644
--- a/src/net/tmwa/playerhandler.cpp
+++ b/src/net/tmwa/playerhandler.cpp
@@ -161,7 +161,7 @@ void PlayerHandler::emote(const uint8_t emoteId) const
void PlayerHandler::increaseAttribute(const int attr) const
{
- if (attr >= STR && attr <= LUK)
+ if (attr >= STR && attr <= Attributes::LUK)
{
createOutPacket(CMSG_STAT_UPDATE_REQUEST);
outMsg.writeInt16(static_cast<int16_t>(attr));
@@ -394,11 +394,16 @@ void PlayerHandler::processPlayerStatUpdate5(Net::MessageIn &msg)
msg.readUInt8("dex cost");
val = msg.readUInt8("luk");
- PlayerInfo::setStatBase(LUK, val);
+ PlayerInfo::setStatBase(Attributes::LUK, val);
if (statusWindow)
- statusWindow->setPointsNeeded(LUK, msg.readUInt8("luk cost"));
+ {
+ statusWindow->setPointsNeeded(Attributes::LUK,
+ msg.readUInt8("luk cost"));
+ }
else
+ {
msg.readUInt8("luk cost");
+ }
PlayerInfo::setStatBase(Attributes::ATK, msg.readInt16("atk"), false);
PlayerInfo::setStatMod(Attributes::ATK, msg.readInt16("atk+"));