diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-10-01 17:26:27 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-10-01 19:28:09 +0300 |
commit | 43713ab4bb834e898c0d2c3289555d22fe08132e (patch) | |
tree | 8ae0f663ad44cb5d754babff17d25e09e8b6a2bf /src/net/eathena | |
parent | 10b5b99e5e7e5f332c077a2d261df8f02f111c4f (diff) | |
download | manaplus-43713ab4bb834e898c0d2c3289555d22fe08132e.tar.gz manaplus-43713ab4bb834e898c0d2c3289555d22fe08132e.tar.bz2 manaplus-43713ab4bb834e898c0d2c3289555d22fe08132e.tar.xz manaplus-43713ab4bb834e898c0d2c3289555d22fe08132e.zip |
Move VIT stat from net enum into attributes.
Diffstat (limited to 'src/net/eathena')
-rw-r--r-- | src/net/eathena/attrs.h | 3 | ||||
-rw-r--r-- | src/net/eathena/generalhandler.cpp | 2 | ||||
-rw-r--r-- | src/net/eathena/playerhandler.cpp | 9 |
3 files changed, 9 insertions, 5 deletions
diff --git a/src/net/eathena/attrs.h b/src/net/eathena/attrs.h index b18834c5c..9053886a8 100644 --- a/src/net/eathena/attrs.h +++ b/src/net/eathena/attrs.h @@ -30,8 +30,7 @@ namespace EAthena JOB = 0xa, STR = 0xd, - AGI, - VIT + AGI }; } // namespace EAthena diff --git a/src/net/eathena/generalhandler.cpp b/src/net/eathena/generalhandler.cpp index d807654c0..268cd0f7a 100644 --- a/src/net/eathena/generalhandler.cpp +++ b/src/net/eathena/generalhandler.cpp @@ -348,7 +348,7 @@ void GeneralHandler::gameStarted() const statusWindow->addAttribute(STR, _("Strength"), "str", true); statusWindow->addAttribute(AGI, _("Agility"), "agi", true); - statusWindow->addAttribute(VIT, _("Vitality"), "vit", true); + statusWindow->addAttribute(Attributes::VIT, _("Vitality"), "vit", true); statusWindow->addAttribute(Attributes::INT, _("Intelligence"), "int", true); statusWindow->addAttribute(Attributes::DEX, _("Dexterity"), "dex", true); diff --git a/src/net/eathena/playerhandler.cpp b/src/net/eathena/playerhandler.cpp index 75996016b..ac035826d 100644 --- a/src/net/eathena/playerhandler.cpp +++ b/src/net/eathena/playerhandler.cpp @@ -305,11 +305,16 @@ void PlayerHandler::processPlayerStatUpdate5(Net::MessageIn &msg) msg.readUInt8("agi cost"); val = msg.readUInt8("vit"); - PlayerInfo::setStatBase(VIT, val); + PlayerInfo::setStatBase(Attributes::VIT, val); if (statusWindow) - statusWindow->setPointsNeeded(VIT, msg.readUInt8("vit cost")); + { + statusWindow->setPointsNeeded(Attributes::VIT, + msg.readUInt8("vit cost")); + } else + { msg.readUInt8("vit cost"); + } val = msg.readUInt8("int"); PlayerInfo::setStatBase(Attributes::INT, val); |