From 11000f010f19a2de85ba26660b451c7c41ab3a97 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 16 Nov 2015 20:23:30 +0300 Subject: Move MagicSchool enum into separate file and convert to strong typed. --- src/textcommand.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'src/textcommand.cpp') diff --git a/src/textcommand.cpp b/src/textcommand.cpp index 5dbaa578d..baca21090 100644 --- a/src/textcommand.cpp +++ b/src/textcommand.cpp @@ -34,12 +34,16 @@ #include "debug.h" -TextCommand::TextCommand(const unsigned int id, const std::string &symbol, +TextCommand::TextCommand(const unsigned int id, + const std::string &symbol, const std::string &command, const std::string &comment, - const CommandTargetT type, const std::string &icon, - const unsigned int basicLvl, const MagicSchool school, - const unsigned int schoolLvl, const int mana) : + const CommandTargetT type, + const std::string &icon, + const unsigned int basicLvl, + const MagicSchoolT school, + const unsigned int schoolLvl, + const int mana) : mCommand(command), mComment(comment), mSymbol(symbol), @@ -68,7 +72,7 @@ TextCommand::TextCommand(const unsigned int id, const std::string &symbol, mIcon(icon), mId(id), mMana(0), - mSchool(SKILL_MAGIC), + mSchool(MagicSchool::SkillMagic), mBaseLvl(0), mSchoolLvl(0), mCommandType(TEXT_COMMAND_TEXT), @@ -85,7 +89,7 @@ TextCommand::TextCommand(const unsigned int id) : mIcon(""), mId(id), mMana(0), - mSchool(SKILL_MAGIC), + mSchool(MagicSchool::SkillMagic), mBaseLvl(0), mSchoolLvl(0), mCommandType(TEXT_COMMAND_TEXT), -- cgit v1.2.3-60-g2f50