diff options
author | Andrei Karas <akaras@inbox.ru> | 2015-11-16 20:23:30 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2015-11-16 20:23:30 +0300 |
commit | 11000f010f19a2de85ba26660b451c7c41ab3a97 (patch) | |
tree | 65eee18b5fcb17f35cb90fcc930242e02b0a79f1 /src/resources | |
parent | 18bd0722a9cebc3ba80bfb74a5b5ba0dd9e53c75 (diff) | |
download | manaverse-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/resources')
-rw-r--r-- | src/resources/db/commandsdb.cpp | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/src/resources/db/commandsdb.cpp b/src/resources/db/commandsdb.cpp index 2203cbaa8..69c918f86 100644 --- a/src/resources/db/commandsdb.cpp +++ b/src/resources/db/commandsdb.cpp @@ -117,14 +117,25 @@ void CommandsDB::loadXmlFile(const std::string &fileName) TextCommand *cmd = nullptr; if (skill1) { - cmd = new TextCommand(id, name, command, comment, - targetType, icon, level1, static_cast<MagicSchool>(skill2), - level2, mana); + cmd = new TextCommand(id, + name, + command, + comment, + targetType, + icon, + level1, + static_cast<MagicSchoolT>(skill2), + level2, + mana); } else { - cmd = new TextCommand(id, name, command, comment, - targetType, icon); + cmd = new TextCommand(id, + name, + command, + comment, + targetType, + icon); } mCommands[id] = cmd; } |