From 97ceb0fc66be86d09b2bc42b7580d3976cbddd80 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 1 Oct 2014 17:16:05 +0300 Subject: Move DEX stat from net enum into attributes. --- src/net/tmwa/attrs.h | 3 +-- src/net/tmwa/generalhandler.cpp | 2 +- src/net/tmwa/playerhandler.cpp | 9 +++++++-- 3 files changed, 9 insertions(+), 5 deletions(-) (limited to 'src/net/tmwa') diff --git a/src/net/tmwa/attrs.h b/src/net/tmwa/attrs.h index 0377d10cd..fe2068965 100644 --- a/src/net/tmwa/attrs.h +++ b/src/net/tmwa/attrs.h @@ -32,8 +32,7 @@ namespace TmwAthena STR = 0xd, AGI, VIT, - INT, - DEX + INT }; } // namespace TmwAthena diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp index d246d1980..c0e341b00 100644 --- a/src/net/tmwa/generalhandler.cpp +++ b/src/net/tmwa/generalhandler.cpp @@ -313,7 +313,7 @@ void GeneralHandler::gameStarted() const // TRANSLATORS: player stat statusWindow->addAttribute(INT, _("Intelligence"), "int", true); // TRANSLATORS: player stat - statusWindow->addAttribute(DEX, _("Dexterity"), "dex", true); + statusWindow->addAttribute(Attributes::DEX, _("Dexterity"), "dex", true); // TRANSLATORS: player stat statusWindow->addAttribute(Attributes::LUK, _("Luck"), "luk", true); // TRANSLATORS: player stat diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp index 217d7aff8..5ef1439fe 100644 --- a/src/net/tmwa/playerhandler.cpp +++ b/src/net/tmwa/playerhandler.cpp @@ -387,11 +387,16 @@ void PlayerHandler::processPlayerStatUpdate5(Net::MessageIn &msg) msg.readUInt8("int cost"); val = msg.readUInt8("dex"); - PlayerInfo::setStatBase(DEX, val); + PlayerInfo::setStatBase(Attributes::DEX, val); if (statusWindow) - statusWindow->setPointsNeeded(DEX, msg.readUInt8("dex cost")); + { + statusWindow->setPointsNeeded(Attributes::DEX, + msg.readUInt8("dex cost")); + } else + { msg.readUInt8("dex cost"); + } val = msg.readUInt8("luk"); PlayerInfo::setStatBase(Attributes::LUK, val); -- cgit v1.2.3-70-g09d2