From e6853de603d64bd6e194e308e5e532339545e892 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 1 Oct 2014 16:32:05 +0300 Subject: Move DEF stat from net enum into attributes. --- src/net/tmwa/attrs.h | 3 +-- src/net/tmwa/generalhandler.cpp | 2 +- src/net/tmwa/playerhandler.cpp | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) (limited to 'src/net/tmwa') 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+")); -- cgit v1.2.3-70-g09d2