diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-11-23 01:00:04 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-11-23 01:00:04 +0300 |
| commit | 26c14e5269feafec782166f80c31fe1a7c2b3d53 (patch) | |
| tree | 3e3af33e53421438332a8738f273d032d7165640 /src/gui | |
| parent | 9a50b90628eb61e1e48db35a36e9ad5c2a9a2bd5 (diff) | |
| download | manaplus-26c14e5269feafec782166f80c31fe1a7c2b3d53.tar.gz manaplus-26c14e5269feafec782166f80c31fe1a7c2b3d53.tar.bz2 manaplus-26c14e5269feafec782166f80c31fe1a7c2b3d53.tar.xz manaplus-26c14e5269feafec782166f80c31fe1a7c2b3d53.zip | |
Add chat command skill.
New chat command: /skill ID[ LEVEL[ TEXT]]
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/windows/skilldialog.cpp | 58 | ||||
| -rw-r--r-- | src/gui/windows/skilldialog.h | 10 |
2 files changed, 52 insertions, 16 deletions
diff --git a/src/gui/windows/skilldialog.cpp b/src/gui/windows/skilldialog.cpp index 44d02b573..e163923cc 100644 --- a/src/gui/windows/skilldialog.cpp +++ b/src/gui/windows/skilldialog.cpp @@ -704,9 +704,27 @@ void SkillDialog::playCastingDstTileEffect(const int id, paths.getIntValue("skillCastingGroundEffectId")); } +void SkillDialog::useSkill(const int skillId, + const AutoTarget autoTarget, + int level, + const bool withText, + const std::string &text) +{ + SkillInfo *const info = skillDialog->getSkill(skillId); + if (!info) + return; + useSkill(info, + autoTarget, + level, + withText, + text); +} + void SkillDialog::useSkill(const SkillInfo *const info, const AutoTarget autoTarget, - int level) + int level, + const bool withText, + const std::string &text) { if (!info || !localPlayer) return; @@ -766,20 +784,30 @@ void SkillDialog::useSkill(const SkillInfo *const info, viewport->getMouseTile(x, y); if (info->useTextParameter) { - textSkillListener.setSkill(info->id, - x, - y, - level); - TextDialog *const dialog = CREATEWIDGETR(TextDialog, - // TRANSLATORS: text skill dialog header - strprintf(_("Add text to skill %s"), - data->name.c_str()), - // TRANSLATORS: text skill dialog field - _("Text: ")); - dialog->setModal(Modal_true); - textSkillListener.setDialog(dialog); - dialog->setActionEventId("ok"); - dialog->addActionListener(&textSkillListener); + if (withText) + { + skillHandler->usePos(info->id, + level, + x, y, + text); + } + else + { + textSkillListener.setSkill(info->id, + x, + y, + level); + TextDialog *const dialog = CREATEWIDGETR(TextDialog, + // TRANSLATORS: text skill dialog header + strprintf(_("Add text to skill %s"), + data->name.c_str()), + // TRANSLATORS: text skill dialog field + _("Text: ")); + dialog->setModal(Modal_true); + textSkillListener.setDialog(dialog); + dialog->setActionEventId("ok"); + dialog->addActionListener(&textSkillListener); + } } else { diff --git a/src/gui/windows/skilldialog.h b/src/gui/windows/skilldialog.h index 2e0125e9c..6618e7f49 100644 --- a/src/gui/windows/skilldialog.h +++ b/src/gui/windows/skilldialog.h @@ -140,9 +140,17 @@ class SkillDialog final : public Window, void removeSkill(const int id); + static void useSkill(const int skillId, + const AutoTarget autoTarget, + int level, + const bool withText, + const std::string &text); + static void useSkill(const SkillInfo *const info, const AutoTarget autoTarget, - int level); + int level, + const bool withText = false, + const std::string &text = ""); SkillData *getSkillData(const int id) const; |