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/tmwa | |
| parent | 10b5b99e5e7e5f332c077a2d261df8f02f111c4f (diff) | |
| download | plus-43713ab4bb834e898c0d2c3289555d22fe08132e.tar.gz plus-43713ab4bb834e898c0d2c3289555d22fe08132e.tar.bz2 plus-43713ab4bb834e898c0d2c3289555d22fe08132e.tar.xz plus-43713ab4bb834e898c0d2c3289555d22fe08132e.zip | |
Move VIT stat from net enum into attributes.
Diffstat (limited to 'src/net/tmwa')
| -rw-r--r-- | src/net/tmwa/attrs.h | 3 | ||||
| -rw-r--r-- | src/net/tmwa/generalhandler.cpp | 2 | ||||
| -rw-r--r-- | src/net/tmwa/playerhandler.cpp | 9 |
3 files changed, 9 insertions, 5 deletions
diff --git a/src/net/tmwa/attrs.h b/src/net/tmwa/attrs.h index 746b05607..75bf75e1b 100644 --- a/src/net/tmwa/attrs.h +++ b/src/net/tmwa/attrs.h @@ -30,8 +30,7 @@ namespace TmwAthena JOB = 0xa, STR = 0xd, - AGI, - VIT + AGI }; } // namespace TmwAthena diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp index f2ed990fe..a41d900c4 100644 --- a/src/net/tmwa/generalhandler.cpp +++ b/src/net/tmwa/generalhandler.cpp @@ -309,7 +309,7 @@ void GeneralHandler::gameStarted() const // TRANSLATORS: player stat statusWindow->addAttribute(AGI, _("Agility"), "agi", true); // TRANSLATORS: player stat - statusWindow->addAttribute(VIT, _("Vitality"), "vit", true); + statusWindow->addAttribute(Attributes::VIT, _("Vitality"), "vit", true); // TRANSLATORS: player stat statusWindow->addAttribute(Attributes::INT, _("Intelligence"), "int", true); diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp index 78d4876f2..6e7d4f9a6 100644 --- a/src/net/tmwa/playerhandler.cpp +++ b/src/net/tmwa/playerhandler.cpp @@ -373,11 +373,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); |