diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-10-02 18:57:10 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-10-02 18:57:10 +0300 |
| commit | f1e92aca00a4859047e83fab76220767b9a2f814 (patch) | |
| tree | 8aaa9d6853c6a8e0e8fc568c6f981cbd889b0cc3 /src/textcommand.cpp | |
| parent | 70b520b1e876f9698bb95baa2d274ea289a0c6bd (diff) | |
| parent | 99771a1fb50286fdb0b511f425312503e657eddc (diff) | |
| download | plus-f1e92aca00a4859047e83fab76220767b9a2f814.tar.gz plus-f1e92aca00a4859047e83fab76220767b9a2f814.tar.bz2 plus-f1e92aca00a4859047e83fab76220767b9a2f814.tar.xz plus-f1e92aca00a4859047e83fab76220767b9a2f814.zip | |
Merge branch 'master' into strippedstripped1.1.10.2
Conflicts:
packaging/debian/watch
Diffstat (limited to 'src/textcommand.cpp')
| -rw-r--r-- | src/textcommand.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/textcommand.cpp b/src/textcommand.cpp index 1402576d1..30d8c2a4c 100644 --- a/src/textcommand.cpp +++ b/src/textcommand.cpp @@ -31,11 +31,12 @@ #include "debug.h" TextCommand::TextCommand(unsigned int id, std::string symbol, - std::string command, SpellTarget type, - std::string icon, unsigned int basicLvl, - MagicSchool school, unsigned int schoolLvl, - int mana) : + std::string command, std::string comment, + SpellTarget type, std::string icon, + unsigned int basicLvl, MagicSchool school, + unsigned int schoolLvl, int mana) : mCommand(command), + mComment(comment), mSymbol(symbol), mTargetType(type), mIcon(icon), @@ -52,9 +53,10 @@ TextCommand::TextCommand(unsigned int id, std::string symbol, TextCommand::TextCommand(unsigned int id, std::string symbol, - std::string command, SpellTarget type, - std::string icon) : + std::string command, std::string comment, + SpellTarget type, std::string icon) : mCommand(command), + mComment(comment), mSymbol(symbol), mTargetType(type), mIcon(icon), @@ -71,6 +73,7 @@ TextCommand::TextCommand(unsigned int id, std::string symbol, TextCommand::TextCommand(unsigned int id) : mCommand(""), + mComment(""), mSymbol(""), mTargetType(NOTARGET), mIcon(""), |