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/tmwa | |
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/tmwa')
-rw-r--r-- | src/net/tmwa/attrs.h | 3 | ||||
-rw-r--r-- | src/net/tmwa/generalhandler.cpp | 2 | ||||
-rw-r--r-- | src/net/tmwa/playerhandler.cpp | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/net/tmwa/attrs.h b/src/net/tmwa/attrs.h index 03c38d804..bd5a0cae4 100644 --- a/src/net/tmwa/attrs.h +++ b/src/net/tmwa/attrs.h @@ -36,8 +36,7 @@ namespace TmwAthena DEX, LUK, - ATK, - DEF + ATK }; } // namespace TmwAthena diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp index 0fdb7017c..ecc320219 100644 --- a/src/net/tmwa/generalhandler.cpp +++ b/src/net/tmwa/generalhandler.cpp @@ -320,7 +320,7 @@ void GeneralHandler::gameStarted() const // TRANSLATORS: player stat statusWindow->addAttribute(ATK, _("Attack")); // TRANSLATORS: player stat - statusWindow->addAttribute(DEF, _("Defense")); + statusWindow->addAttribute(Attributes::DEF, _("Defense")); // TRANSLATORS: player stat statusWindow->addAttribute(Attributes::MATK, _("M.Attack")); // TRANSLATORS: player stat diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp index 247a0f6d9..504484217 100644 --- a/src/net/tmwa/playerhandler.cpp +++ b/src/net/tmwa/playerhandler.cpp @@ -410,8 +410,8 @@ void PlayerHandler::processPlayerStatUpdate5(Net::MessageIn &msg) val = msg.readInt16("matk+"); PlayerInfo::setStatMod(Attributes::MATK, val); - PlayerInfo::setStatBase(DEF, msg.readInt16("def"), false); - PlayerInfo::setStatMod(DEF, msg.readInt16("def+")); + PlayerInfo::setStatBase(Attributes::DEF, msg.readInt16("def"), false); + PlayerInfo::setStatMod(Attributes::DEF, msg.readInt16("def+")); PlayerInfo::setStatBase(Attributes::MDEF, msg.readInt16("mdef"), false); PlayerInfo::setStatMod(Attributes::MDEF, msg.readInt16("mdef+")); |