summaryrefslogtreecommitdiff
path: root/src/textcommand.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-11-16 20:23:30 +0300
committerAndrei Karas <akaras@inbox.ru>2015-11-16 20:23:30 +0300
commit11000f010f19a2de85ba26660b451c7c41ab3a97 (patch)
tree65eee18b5fcb17f35cb90fcc930242e02b0a79f1 /src/textcommand.cpp
parent18bd0722a9cebc3ba80bfb74a5b5ba0dd9e53c75 (diff)
downloadmanaverse-11000f010f19a2de85ba26660b451c7c41ab3a97.tar.gz
manaverse-11000f010f19a2de85ba26660b451c7c41ab3a97.tar.bz2
manaverse-11000f010f19a2de85ba26660b451c7c41ab3a97.tar.xz
manaverse-11000f010f19a2de85ba26660b451c7c41ab3a97.zip
Move MagicSchool enum into separate file and convert to strong typed.
Diffstat (limited to 'src/textcommand.cpp')
-rw-r--r--src/textcommand.cpp16
1 files changed, 10 insertions, 6 deletions
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),