summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-08-14 21:24:59 +0300
committerAndrei Karas <akaras@inbox.ru>2016-08-14 22:55:08 +0300
commit8d0dc6e707c470ccd2d3a3d4e44cfdee0ed890d9 (patch)
tree609b5baed396ca34d9199bd8e7a577e6ef7a1759
parent0204a75a049d6819719cf41ac92116012ed50d86 (diff)
downloadmanaverse-8d0dc6e707c470ccd2d3a3d4e44cfdee0ed890d9.tar.gz
manaverse-8d0dc6e707c470ccd2d3a3d4e44cfdee0ed890d9.tar.bz2
manaverse-8d0dc6e707c470ccd2d3a3d4e44cfdee0ed890d9.tar.xz
manaverse-8d0dc6e707c470ccd2d3a3d4e44cfdee0ed890d9.zip
Remove default parameters from useSkill method in SkillDialog.
-rw-r--r--src/gui/windows/skilldialog.cpp6
-rw-r--r--src/gui/windows/skilldialog.h4
2 files changed, 6 insertions, 4 deletions
diff --git a/src/gui/windows/skilldialog.cpp b/src/gui/windows/skilldialog.cpp
index 5df9428ce..2904ea525 100644
--- a/src/gui/windows/skilldialog.cpp
+++ b/src/gui/windows/skilldialog.cpp
@@ -176,7 +176,9 @@ void SkillDialog::action(const ActionEvent &event)
const SkillInfo *const info = tab->getSelectedInfo();
useSkill(info,
fromBool(config.getBoolValue("skillAutotarget"), AutoTarget),
- info->customSelectedLevel);
+ info->customSelectedLevel,
+ info->useTextParameter,
+ std::string());
}
}
else if (eventId == "close")
@@ -626,7 +628,7 @@ void SkillDialog::useItem(const int itemId,
const SkillInfo *const info = (*it).second;
if (data.empty())
{
- useSkill(info, autoTarget, level);
+ useSkill(info, autoTarget, level, false, std::string());
}
else if (data.size() > 1)
{
diff --git a/src/gui/windows/skilldialog.h b/src/gui/windows/skilldialog.h
index b93fda1b9..79c3ecc9c 100644
--- a/src/gui/windows/skilldialog.h
+++ b/src/gui/windows/skilldialog.h
@@ -149,8 +149,8 @@ class SkillDialog final : public Window,
static void useSkill(const SkillInfo *const info,
const AutoTarget autoTarget,
int level,
- const bool withText = false,
- const std::string &text = "");
+ const bool withText,
+ const std::string &text);
SkillData *getSkillData(const int id) const;