summaryrefslogtreecommitdiff
path: root/src/textcommand.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-09-18 17:49:18 +0300
committerAndrei Karas <akaras@inbox.ru>2011-09-18 17:49:18 +0300
commit70b520b1e876f9698bb95baa2d274ea289a0c6bd (patch)
tree152c7519b0d9b8fb424af2373ec48db823a85575 /src/textcommand.cpp
parent62ec17f6e489ec50f17219444468aeb8969dc961 (diff)
parent3b999f51c740d0541c53d223518e5e4bb482d996 (diff)
downloadmanaplus-70b520b1e876f9698bb95baa2d274ea289a0c6bd.tar.gz
manaplus-70b520b1e876f9698bb95baa2d274ea289a0c6bd.tar.bz2
manaplus-70b520b1e876f9698bb95baa2d274ea289a0c6bd.tar.xz
manaplus-70b520b1e876f9698bb95baa2d274ea289a0c6bd.zip
Merge branch 'master' into strippedstripped1.1.9.18
Conflicts: src/guichan/cliprectangle.cpp src/guichan/focushandler.cpp src/guichan/gui.cpp src/guichan/include/guichan/cliprectangle.hpp src/guichan/include/guichan/inputevent.hpp src/guichan/include/guichan/keyevent.hpp src/guichan/include/guichan/mouseevent.hpp src/guichan/include/guichan/widgets/button.hpp src/guichan/include/guichan/widgets/checkbox.hpp src/guichan/include/guichan/widgets/dropdown.hpp src/guichan/include/guichan/widgets/radiobutton.hpp src/guichan/include/guichan/widgets/slider.hpp src/guichan/include/guichan/widgets/tab.hpp src/guichan/include/guichan/widgets/tabbedarea.hpp src/guichan/include/guichan/widgets/textfield.hpp src/guichan/include/guichan/widgets/window.hpp src/guichan/inputevent.cpp src/guichan/keyevent.cpp src/guichan/mouseevent.cpp src/guichan/widget.cpp src/guichan/widgets/button.cpp src/guichan/widgets/checkbox.cpp src/guichan/widgets/dropdown.cpp src/guichan/widgets/radiobutton.cpp src/guichan/widgets/slider.cpp src/guichan/widgets/tab.cpp src/guichan/widgets/tabbedarea.cpp src/guichan/widgets/textfield.cpp src/guichan/widgets/window.cpp
Diffstat (limited to 'src/textcommand.cpp')
-rw-r--r--src/textcommand.cpp64
1 files changed, 31 insertions, 33 deletions
diff --git a/src/textcommand.cpp b/src/textcommand.cpp
index 665668c7e..1402576d1 100644
--- a/src/textcommand.cpp
+++ b/src/textcommand.cpp
@@ -35,18 +35,18 @@ TextCommand::TextCommand(unsigned int id, std::string symbol,
std::string icon, unsigned int basicLvl,
MagicSchool school, unsigned int schoolLvl,
int mana) :
+ mCommand(command),
+ mSymbol(symbol),
+ mTargetType(type),
+ mIcon(icon),
+ mId(id),
+ mMana(mana),
+ mSchool(school),
+ mBaseLvl(basicLvl),
+ mSchoolLvl(schoolLvl),
+ mCommandType(TEXT_COMMAND_MAGIC),
mImage(0)
{
- mId = id;
- mCommand = command;
- mSymbol = symbol;
- mTargetType = type;
- mIcon = icon;
- mBaseLvl = basicLvl;
- mSchool = school;
- mSchoolLvl = schoolLvl;
- mMana = mana;
- mCommandType = TEXT_COMMAND_MAGIC;
loadImage();
}
@@ -54,36 +54,34 @@ TextCommand::TextCommand(unsigned int id, std::string symbol,
TextCommand::TextCommand(unsigned int id, std::string symbol,
std::string command, SpellTarget type,
std::string icon) :
+ mCommand(command),
+ mSymbol(symbol),
+ mTargetType(type),
+ mIcon(icon),
+ mId(id),
+ mMana(0),
+ mSchool(SKILL_MAGIC),
+ mBaseLvl(0),
+ mSchoolLvl(0),
+ mCommandType(TEXT_COMMAND_TEXT),
mImage(0)
{
- mId = id;
- mCommand = command;
- mSymbol = symbol;
- mTargetType = type;
- mIcon = icon;
- mCommandType = TEXT_COMMAND_TEXT;
- mBaseLvl = 0;
- mSchool = SKILL_MAGIC;
- mSchoolLvl = 0;
- mMana = 0;
- mCommandType = TEXT_COMMAND_TEXT;
loadImage();
}
TextCommand::TextCommand(unsigned int id) :
+ mCommand(""),
+ mSymbol(""),
+ mTargetType(NOTARGET),
+ mIcon(""),
+ mId(id),
+ mMana(0),
+ mSchool(SKILL_MAGIC),
+ mBaseLvl(0),
+ mSchoolLvl(0),
+ mCommandType(TEXT_COMMAND_TEXT),
mImage(0)
{
- mId = id;
- mCommand = "";
- mSymbol = "";
- mTargetType = NOTARGET;
- mIcon = "";
- mCommandType = TEXT_COMMAND_TEXT;
- mBaseLvl = 0;
- mSchool = SKILL_MAGIC;
- mSchoolLvl = 0;
- mMana = 0;
- mCommandType = TEXT_COMMAND_TEXT;
loadImage();
}
@@ -114,4 +112,4 @@ void TextCommand::loadImage()
if (!mImage)
mImage = Theme::getImageFromTheme("unknown-item.png");
-} \ No newline at end of file
+}