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/eathena/attrs.h | 3 +-- src/net/eathena/generalhandler.cpp | 2 +- src/net/eathena/playerhandler.cpp | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) (limited to 'src/net/eathena') 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); -- cgit v1.2.3-60-g2f50