From b35357cfcd58ac26d2f9d008a2db5b931cccb428 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 1 Oct 2014 17:39:32 +0300 Subject: Move AGI stat from net enum into attributes. --- src/net/eathena/attrs.h | 3 +-- src/net/eathena/generalhandler.cpp | 2 +- src/net/eathena/playerhandler.cpp | 9 +++++++-- 3 files changed, 9 insertions(+), 5 deletions(-) (limited to 'src/net/eathena') diff --git a/src/net/eathena/attrs.h b/src/net/eathena/attrs.h index 9053886a8..77eeb5efd 100644 --- a/src/net/eathena/attrs.h +++ b/src/net/eathena/attrs.h @@ -29,8 +29,7 @@ namespace EAthena { JOB = 0xa, - STR = 0xd, - AGI + STR = 0xd }; } // namespace EAthena diff --git a/src/net/eathena/generalhandler.cpp b/src/net/eathena/generalhandler.cpp index 268cd0f7a..f94594933 100644 --- a/src/net/eathena/generalhandler.cpp +++ b/src/net/eathena/generalhandler.cpp @@ -347,7 +347,7 @@ void GeneralHandler::gameStarted() const statusWindow->clearAttributes(); statusWindow->addAttribute(STR, _("Strength"), "str", true); - statusWindow->addAttribute(AGI, _("Agility"), "agi", true); + statusWindow->addAttribute(Attributes::AGI, _("Agility"), "agi", true); statusWindow->addAttribute(Attributes::VIT, _("Vitality"), "vit", true); statusWindow->addAttribute(Attributes::INT, _("Intelligence"), "int", true); diff --git a/src/net/eathena/playerhandler.cpp b/src/net/eathena/playerhandler.cpp index ac035826d..8e3b8f910 100644 --- a/src/net/eathena/playerhandler.cpp +++ b/src/net/eathena/playerhandler.cpp @@ -298,11 +298,16 @@ void PlayerHandler::processPlayerStatUpdate5(Net::MessageIn &msg) msg.readUInt8("str need"); val = msg.readUInt8("agi"); - PlayerInfo::setStatBase(AGI, val); + PlayerInfo::setStatBase(Attributes::AGI, val); if (statusWindow) - statusWindow->setPointsNeeded(AGI, msg.readUInt8("agi cost")); + { + statusWindow->setPointsNeeded(Attributes::AGI, + msg.readUInt8("agi cost")); + } else + { msg.readUInt8("agi cost"); + } val = msg.readUInt8("vit"); PlayerInfo::setStatBase(Attributes::VIT, val); -- cgit v1.2.3-60-g2f50