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/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 04a49a9ca..50a7ca977 100644 --- a/src/net/tmwa/attrs.h +++ b/src/net/tmwa/attrs.h @@ -38,8 +38,7 @@ namespace TmwAthena ATK, DEF, - MATK, - MDEF + MATK }; } // namespace TmwAthena diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp index 3ec0e234d..effe75204 100644 --- a/src/net/tmwa/generalhandler.cpp +++ b/src/net/tmwa/generalhandler.cpp @@ -324,7 +324,7 @@ void GeneralHandler::gameStarted() const // TRANSLATORS: player stat statusWindow->addAttribute(MATK, _("M.Attack")); // TRANSLATORS: player stat - statusWindow->addAttribute(MDEF, _("M.Defense")); + statusWindow->addAttribute(Attributes::MDEF, _("M.Defense")); // TRANSLATORS: player stat // xgettext:no-c-format statusWindow->addAttribute(Attributes::HIT, _("% Accuracy")); diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp index 514a1d839..857ac1e8d 100644 --- a/src/net/tmwa/playerhandler.cpp +++ b/src/net/tmwa/playerhandler.cpp @@ -413,8 +413,8 @@ void PlayerHandler::processPlayerStatUpdate5(Net::MessageIn &msg) PlayerInfo::setStatBase(DEF, msg.readInt16("def"), false); PlayerInfo::setStatMod(DEF, msg.readInt16("def+")); - PlayerInfo::setStatBase(MDEF, msg.readInt16("mdef"), false); - PlayerInfo::setStatMod(MDEF, msg.readInt16("mdef+")); + PlayerInfo::setStatBase(Attributes::MDEF, msg.readInt16("mdef"), false); + PlayerInfo::setStatMod(Attributes::MDEF, msg.readInt16("mdef+")); PlayerInfo::setStatBase(Attributes::HIT, msg.readInt16("hit")); -- cgit v1.2.3-70-g09d2