diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-10-01 16:01:43 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-10-01 19:28:09 +0300 |
| commit | 52c0fc91e3b59b0f9a2cac98cb4cd1eb5847884c (patch) | |
| tree | cf74fecfc3e828a0aefb81545e7e5aca417787c0 /src/net/eathena | |
| parent | b43ec95b7046619a35f5bdf2f3c1bb3e9663bdb7 (diff) | |
| download | plus-52c0fc91e3b59b0f9a2cac98cb4cd1eb5847884c.tar.gz plus-52c0fc91e3b59b0f9a2cac98cb4cd1eb5847884c.tar.bz2 plus-52c0fc91e3b59b0f9a2cac98cb4cd1eb5847884c.tar.xz plus-52c0fc91e3b59b0f9a2cac98cb4cd1eb5847884c.zip | |
Move MATK stat from net enum into attributes.
Diffstat (limited to 'src/net/eathena')
| -rw-r--r-- | src/net/eathena/attrs.h | 3 | ||||
| -rw-r--r-- | src/net/eathena/generalhandler.cpp | 2 | ||||
| -rw-r--r-- | src/net/eathena/playerhandler.cpp | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/net/eathena/attrs.h b/src/net/eathena/attrs.h index 65783b3a9..c40b48092 100644 --- a/src/net/eathena/attrs.h +++ b/src/net/eathena/attrs.h @@ -37,8 +37,7 @@ namespace EAthena LUK, ATK, - DEF, - MATK + DEF }; } // namespace EAthena diff --git a/src/net/eathena/generalhandler.cpp b/src/net/eathena/generalhandler.cpp index 9ca3fb3bd..a07040f18 100644 --- a/src/net/eathena/generalhandler.cpp +++ b/src/net/eathena/generalhandler.cpp @@ -355,7 +355,7 @@ void GeneralHandler::gameStarted() const statusWindow->addAttribute(ATK, _("Attack")); statusWindow->addAttribute(DEF, _("Defense")); - statusWindow->addAttribute(MATK, _("M.Attack")); + statusWindow->addAttribute(Attributes::MATK, _("M.Attack")); statusWindow->addAttribute(Attributes::MDEF, _("M.Defense")); // xgettext:no-c-format statusWindow->addAttribute(Attributes::HIT, _("% Accuracy")); diff --git a/src/net/eathena/playerhandler.cpp b/src/net/eathena/playerhandler.cpp index c8a5705c7..b3b7df25b 100644 --- a/src/net/eathena/playerhandler.cpp +++ b/src/net/eathena/playerhandler.cpp @@ -337,10 +337,10 @@ void PlayerHandler::processPlayerStatUpdate5(Net::MessageIn &msg) PlayerInfo::updateAttrs(); val = msg.readInt16("right matk"); - PlayerInfo::setStatBase(MATK, val, false); + PlayerInfo::setStatBase(Attributes::MATK, val, false); val = msg.readInt16("left matk"); - PlayerInfo::setStatMod(MATK, val); + PlayerInfo::setStatMod(Attributes::MATK, val); PlayerInfo::setStatBase(DEF, msg.readInt16("left def"), false); PlayerInfo::setStatMod(DEF, msg.readInt16("right def")); |