Merge branch 'master' into strippedstripped1.1.10.2

Conflicts:
	packaging/debian/watch

1 files changed, 12 insertions, 7 deletions

diff --git a/src/textcommand.h b/src/textcommand.h
index 5ddbe824d..b1af7667d 100644
--- a/src/textcommand.h
+++ b/src/textcommand.h
@@ -62,18 +62,16 @@ class TextCommand
         /**
          * Constructor.
          */
-        TextCommand(unsigned int id, std::string symbol,
-                    std::string command, SpellTarget type,
-                    std::string icon, unsigned int basicLvl,
-                    MagicSchool school = SKILL_MAGIC,
+        TextCommand(unsigned int id, std::string symbol, std::string command,
+                    std::string comment, SpellTarget type, std::string icon,
+                    unsigned int basicLvl, MagicSchool school = SKILL_MAGIC,
                     unsigned int schoolLvl = 0, int mana = 0);
 
         /**
          * Constructor.
          */
-        TextCommand(unsigned int id, std::string symbol,
-                    std::string command, SpellTarget type,
-                    std::string icon);
+        TextCommand(unsigned int id, std::string symbol, std::string command,
+                    std::string comment, SpellTarget type, std::string icon);
 
         /**
          * Constructor.
@@ -91,6 +89,9 @@ class TextCommand
         std::string getCommand() const
         { return mCommand; }
 
+        std::string getComment() const
+        { return mComment; }
+
         std::string getSymbol() const
         { return mSymbol; }
 
@@ -121,6 +122,9 @@ class TextCommand
         void setCommand(std::string command)
         { mCommand = command; }
 
+        void setComment(std::string comment)
+        { mComment = comment; }
+
         void setSymbol(std::string symbol)
         { mSymbol = symbol; }
 
@@ -159,6 +163,7 @@ class TextCommand
 
     protected:
         std::string mCommand;
+        std::string mComment;
         std::string mSymbol;
         SpellTarget mTargetType;
         std::string mIcon;