From 7fa78a35307227453ab55c7452e348a40cd41d65 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 6 May 2015 01:09:47 +0300 Subject: Add strong typed bool type Modifiable. --- src/net/tmwa/generalhandler.cpp | 17 +++++++++++------ src/net/tmwa/skillhandler.cpp | 2 +- 2 files changed, 12 insertions(+), 7 deletions(-) (limited to 'src/net/tmwa') diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp index bf7ff4148..548ee7b8f 100644 --- a/src/net/tmwa/generalhandler.cpp +++ b/src/net/tmwa/generalhandler.cpp @@ -342,18 +342,23 @@ void GeneralHandler::gameStarted() const statusWindow->clearAttributes(); // TRANSLATORS: player stat - statusWindow->addAttribute(Attributes::STR, _("Strength"), "str", true); + statusWindow->addAttribute(Attributes::STR, + _("Strength"), "str", Modifiable_true); // TRANSLATORS: player stat - statusWindow->addAttribute(Attributes::AGI, _("Agility"), "agi", true); + statusWindow->addAttribute(Attributes::AGI, + _("Agility"), "agi", Modifiable_true); // TRANSLATORS: player stat - statusWindow->addAttribute(Attributes::VIT, _("Vitality"), "vit", true); + statusWindow->addAttribute(Attributes::VIT, + _("Vitality"), "vit", Modifiable_true); // TRANSLATORS: player stat statusWindow->addAttribute(Attributes::INT, - _("Intelligence"), "int", true); + _("Intelligence"), "int", Modifiable_true); // TRANSLATORS: player stat - statusWindow->addAttribute(Attributes::DEX, _("Dexterity"), "dex", true); + statusWindow->addAttribute(Attributes::DEX, + _("Dexterity"), "dex", Modifiable_true); // TRANSLATORS: player stat - statusWindow->addAttribute(Attributes::LUK, _("Luck"), "luk", true); + statusWindow->addAttribute(Attributes::LUK, + _("Luck"), "luk", Modifiable_true); // TRANSLATORS: player stat statusWindow->addAttribute(Attributes::ATK, _("Attack")); // TRANSLATORS: player stat diff --git a/src/net/tmwa/skillhandler.cpp b/src/net/tmwa/skillhandler.cpp index b88e9e509..1b8678682 100644 --- a/src/net/tmwa/skillhandler.cpp +++ b/src/net/tmwa/skillhandler.cpp @@ -135,7 +135,7 @@ void SkillHandler::processPlayerSkills(Net::MessageIn &msg) const int sp = msg.readInt16("sp"); const int range = msg.readInt16("range"); msg.skip(24, "unused"); - const int up = msg.readUInt8("up flag"); + const Modifiable up = fromBool(msg.readUInt8("up flag"), Modifiable); const int oldLevel = PlayerInfo::getSkillLevel(skillId); if (oldLevel && oldLevel != level) updateSkill = skillId; -- cgit v1.2.3-70-g09d2