summaryrefslogtreecommitdiff
path: root/src/net/tmwa
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-10-01 17:00:39 +0300
committerAndrei Karas <akaras@inbox.ru>2014-10-01 19:28:09 +0300
commite6eef288f86dcc16aa2b5ba20c9079ead78f17e2 (patch)
treea878c5d7efab2c382bfa53860af305c8148b2c88 /src/net/tmwa
parente6853de603d64bd6e194e308e5e532339545e892 (diff)
downloadmv-e6eef288f86dcc16aa2b5ba20c9079ead78f17e2.tar.gz
mv-e6eef288f86dcc16aa2b5ba20c9079ead78f17e2.tar.bz2
mv-e6eef288f86dcc16aa2b5ba20c9079ead78f17e2.tar.xz
mv-e6eef288f86dcc16aa2b5ba20c9079ead78f17e2.zip
Move ATK stat from net enum into attributes.
Diffstat (limited to 'src/net/tmwa')
-rw-r--r--src/net/tmwa/attrs.h4
-rw-r--r--src/net/tmwa/generalhandler.cpp2
-rw-r--r--src/net/tmwa/playerhandler.cpp4
3 files changed, 4 insertions, 6 deletions
diff --git a/src/net/tmwa/attrs.h b/src/net/tmwa/attrs.h
index bd5a0cae4..7009e6400 100644
--- a/src/net/tmwa/attrs.h
+++ b/src/net/tmwa/attrs.h
@@ -34,9 +34,7 @@ namespace TmwAthena
VIT,
INT,
DEX,
- LUK,
-
- ATK
+ LUK
};
} // namespace TmwAthena
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index ecc320219..5107e873d 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -318,7 +318,7 @@ void GeneralHandler::gameStarted() const
statusWindow->addAttribute(LUK, _("Luck"), "luk", true);
// TRANSLATORS: player stat
- statusWindow->addAttribute(ATK, _("Attack"));
+ statusWindow->addAttribute(Attributes::ATK, _("Attack"));
// TRANSLATORS: player stat
statusWindow->addAttribute(Attributes::DEF, _("Defense"));
// TRANSLATORS: player stat
diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp
index 504484217..f94dabfc2 100644
--- a/src/net/tmwa/playerhandler.cpp
+++ b/src/net/tmwa/playerhandler.cpp
@@ -400,8 +400,8 @@ void PlayerHandler::processPlayerStatUpdate5(Net::MessageIn &msg)
else
msg.readUInt8("luk cost");
- PlayerInfo::setStatBase(ATK, msg.readInt16("atk"), false);
- PlayerInfo::setStatMod(ATK, msg.readInt16("atk+"));
+ PlayerInfo::setStatBase(Attributes::ATK, msg.readInt16("atk"), false);
+ PlayerInfo::setStatMod(Attributes::ATK, msg.readInt16("atk+"));
PlayerInfo::updateAttrs();
val = msg.readInt16("matk");