From b43ec95b7046619a35f5bdf2f3c1bb3e9663bdb7 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 1 Oct 2014 15:47:30 +0300 Subject: Move MDEF stat from net enum into attributes. --- src/net/eathena/attrs.h | 3 +-- src/net/eathena/generalhandler.cpp | 2 +- src/net/eathena/playerhandler.cpp | 5 +++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/net/eathena') diff --git a/src/net/eathena/attrs.h b/src/net/eathena/attrs.h index 75f5653e3..65783b3a9 100644 --- a/src/net/eathena/attrs.h +++ b/src/net/eathena/attrs.h @@ -38,8 +38,7 @@ namespace EAthena ATK, DEF, - MATK, - MDEF + MATK }; } // namespace EAthena diff --git a/src/net/eathena/generalhandler.cpp b/src/net/eathena/generalhandler.cpp index 03c2d8864..9ca3fb3bd 100644 --- a/src/net/eathena/generalhandler.cpp +++ b/src/net/eathena/generalhandler.cpp @@ -356,7 +356,7 @@ void GeneralHandler::gameStarted() const statusWindow->addAttribute(ATK, _("Attack")); statusWindow->addAttribute(DEF, _("Defense")); statusWindow->addAttribute(MATK, _("M.Attack")); - statusWindow->addAttribute(MDEF, _("M.Defense")); + statusWindow->addAttribute(Attributes::MDEF, _("M.Defense")); // xgettext:no-c-format statusWindow->addAttribute(Attributes::HIT, _("% Accuracy")); // xgettext:no-c-format diff --git a/src/net/eathena/playerhandler.cpp b/src/net/eathena/playerhandler.cpp index b0e58c3ff..c8a5705c7 100644 --- a/src/net/eathena/playerhandler.cpp +++ b/src/net/eathena/playerhandler.cpp @@ -345,8 +345,9 @@ void PlayerHandler::processPlayerStatUpdate5(Net::MessageIn &msg) PlayerInfo::setStatBase(DEF, msg.readInt16("left def"), false); PlayerInfo::setStatMod(DEF, msg.readInt16("right def")); - PlayerInfo::setStatBase(MDEF, msg.readInt16("left mdef"), false); - PlayerInfo::setStatMod(MDEF, msg.readInt16("right mdef")); + PlayerInfo::setStatBase(Attributes::MDEF, + msg.readInt16("left mdef"), false); + PlayerInfo::setStatMod(Attributes::MDEF, msg.readInt16("right mdef")); PlayerInfo::setStatBase(Attributes::HIT, msg.readInt16("hit")); -- cgit v1.2.3-70-g09d2