diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-10-01 16:32:05 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-10-01 19:28:09 +0300 |
commit | e6853de603d64bd6e194e308e5e532339545e892 (patch) | |
tree | 8839596e6f54ee6a93a045377d3101f7ef9e66b4 /src/net/eathena | |
parent | 52c0fc91e3b59b0f9a2cac98cb4cd1eb5847884c (diff) | |
download | manaplus-e6853de603d64bd6e194e308e5e532339545e892.tar.gz manaplus-e6853de603d64bd6e194e308e5e532339545e892.tar.bz2 manaplus-e6853de603d64bd6e194e308e5e532339545e892.tar.xz manaplus-e6853de603d64bd6e194e308e5e532339545e892.zip |
Move DEF 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 c40b48092..db866c0bc 100644 --- a/src/net/eathena/attrs.h +++ b/src/net/eathena/attrs.h @@ -36,8 +36,7 @@ namespace EAthena DEX, LUK, - ATK, - DEF + ATK }; } // namespace EAthena diff --git a/src/net/eathena/generalhandler.cpp b/src/net/eathena/generalhandler.cpp index a07040f18..83b55e3bd 100644 --- a/src/net/eathena/generalhandler.cpp +++ b/src/net/eathena/generalhandler.cpp @@ -354,7 +354,7 @@ void GeneralHandler::gameStarted() const statusWindow->addAttribute(LUK, _("Luck"), "luk", true); statusWindow->addAttribute(ATK, _("Attack")); - statusWindow->addAttribute(DEF, _("Defense")); + statusWindow->addAttribute(Attributes::DEF, _("Defense")); statusWindow->addAttribute(Attributes::MATK, _("M.Attack")); statusWindow->addAttribute(Attributes::MDEF, _("M.Defense")); // xgettext:no-c-format diff --git a/src/net/eathena/playerhandler.cpp b/src/net/eathena/playerhandler.cpp index b3b7df25b..c1412819b 100644 --- a/src/net/eathena/playerhandler.cpp +++ b/src/net/eathena/playerhandler.cpp @@ -342,8 +342,8 @@ void PlayerHandler::processPlayerStatUpdate5(Net::MessageIn &msg) val = msg.readInt16("left matk"); PlayerInfo::setStatMod(Attributes::MATK, val); - PlayerInfo::setStatBase(DEF, msg.readInt16("left def"), false); - PlayerInfo::setStatMod(DEF, msg.readInt16("right def")); + PlayerInfo::setStatBase(Attributes::DEF, msg.readInt16("left def"), false); + PlayerInfo::setStatMod(Attributes::DEF, msg.readInt16("right def")); PlayerInfo::setStatBase(Attributes::MDEF, msg.readInt16("left mdef"), false); |