From 10b5b99e5e7e5f332c077a2d261df8f02f111c4f Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 1 Oct 2014 17:21:42 +0300 Subject: Move INT stat from net enum into attributes. --- src/net/tmwa/attrs.h | 3 +-- src/net/tmwa/generalhandler.cpp | 3 ++- src/net/tmwa/playerhandler.cpp | 9 +++++++-- 3 files changed, 10 insertions(+), 5 deletions(-) (limited to 'src/net/tmwa') diff --git a/src/net/tmwa/attrs.h b/src/net/tmwa/attrs.h index fe2068965..746b05607 100644 --- a/src/net/tmwa/attrs.h +++ b/src/net/tmwa/attrs.h @@ -31,8 +31,7 @@ namespace TmwAthena STR = 0xd, AGI, - VIT, - INT + VIT }; } // namespace TmwAthena diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp index c0e341b00..f2ed990fe 100644 --- a/src/net/tmwa/generalhandler.cpp +++ b/src/net/tmwa/generalhandler.cpp @@ -311,7 +311,8 @@ void GeneralHandler::gameStarted() const // TRANSLATORS: player stat statusWindow->addAttribute(VIT, _("Vitality"), "vit", true); // TRANSLATORS: player stat - statusWindow->addAttribute(INT, _("Intelligence"), "int", true); + statusWindow->addAttribute(Attributes::INT, + _("Intelligence"), "int", true); // TRANSLATORS: player stat statusWindow->addAttribute(Attributes::DEX, _("Dexterity"), "dex", true); // TRANSLATORS: player stat diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp index 5ef1439fe..78d4876f2 100644 --- a/src/net/tmwa/playerhandler.cpp +++ b/src/net/tmwa/playerhandler.cpp @@ -380,11 +380,16 @@ void PlayerHandler::processPlayerStatUpdate5(Net::MessageIn &msg) msg.readUInt8("vit cost"); val = msg.readUInt8("int"); - PlayerInfo::setStatBase(INT, val); + PlayerInfo::setStatBase(Attributes::INT, val); if (statusWindow) - statusWindow->setPointsNeeded(INT, msg.readUInt8("int cost")); + { + statusWindow->setPointsNeeded(Attributes::INT, + msg.readUInt8("int cost")); + } else + { msg.readUInt8("int cost"); + } val = msg.readUInt8("dex"); PlayerInfo::setStatBase(Attributes::DEX, val); -- cgit v1.2.3-70-g09d2