diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-10-01 17:00:39 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-10-01 19:28:09 +0300 |
| commit | e6eef288f86dcc16aa2b5ba20c9079ead78f17e2 (patch) | |
| tree | a878c5d7efab2c382bfa53860af305c8148b2c88 /src/net/eathena | |
| parent | e6853de603d64bd6e194e308e5e532339545e892 (diff) | |
| download | plus-e6eef288f86dcc16aa2b5ba20c9079ead78f17e2.tar.gz plus-e6eef288f86dcc16aa2b5ba20c9079ead78f17e2.tar.bz2 plus-e6eef288f86dcc16aa2b5ba20c9079ead78f17e2.tar.xz plus-e6eef288f86dcc16aa2b5ba20c9079ead78f17e2.zip | |
Move ATK stat from net enum into attributes.
Diffstat (limited to 'src/net/eathena')
| -rw-r--r-- | src/net/eathena/attrs.h | 4 | ||||
| -rw-r--r-- | src/net/eathena/generalhandler.cpp | 2 | ||||
| -rw-r--r-- | src/net/eathena/playerhandler.cpp | 4 |
3 files changed, 4 insertions, 6 deletions
diff --git a/src/net/eathena/attrs.h b/src/net/eathena/attrs.h index db866c0bc..049aff97f 100644 --- a/src/net/eathena/attrs.h +++ b/src/net/eathena/attrs.h @@ -34,9 +34,7 @@ namespace EAthena VIT, INT, DEX, - LUK, - - ATK + LUK }; } // namespace EAthena diff --git a/src/net/eathena/generalhandler.cpp b/src/net/eathena/generalhandler.cpp index 83b55e3bd..bebf22842 100644 --- a/src/net/eathena/generalhandler.cpp +++ b/src/net/eathena/generalhandler.cpp @@ -353,7 +353,7 @@ void GeneralHandler::gameStarted() const statusWindow->addAttribute(DEX, _("Dexterity"), "dex", true); statusWindow->addAttribute(LUK, _("Luck"), "luk", true); - statusWindow->addAttribute(ATK, _("Attack")); + statusWindow->addAttribute(Attributes::ATK, _("Attack")); statusWindow->addAttribute(Attributes::DEF, _("Defense")); statusWindow->addAttribute(Attributes::MATK, _("M.Attack")); statusWindow->addAttribute(Attributes::MDEF, _("M.Defense")); diff --git a/src/net/eathena/playerhandler.cpp b/src/net/eathena/playerhandler.cpp index c1412819b..6fca5bb08 100644 --- a/src/net/eathena/playerhandler.cpp +++ b/src/net/eathena/playerhandler.cpp @@ -332,8 +332,8 @@ void PlayerHandler::processPlayerStatUpdate5(Net::MessageIn &msg) else msg.readUInt8("luk cost"); - PlayerInfo::setStatBase(ATK, msg.readInt16("left atk"), false); - PlayerInfo::setStatMod(ATK, msg.readInt16("right atk")); + PlayerInfo::setStatBase(Attributes::ATK, msg.readInt16("left atk"), false); + PlayerInfo::setStatMod(Attributes::ATK, msg.readInt16("right atk")); PlayerInfo::updateAttrs(); val = msg.readInt16("right matk"); |