From 27a54f7dfa6cd83b9f9ec7f974cd23608a38fd02 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 18 Jul 2016 16:06:29 +0300 Subject: Move skillinfo into resources/skill directory. --- src/CMakeLists.txt | 4 +- src/Makefile.am | 4 +- src/being/being.cpp | 2 +- src/dragdrop.h | 3 +- src/gui/models/skillmodel.h | 3 +- src/gui/popups/popupmenu.cpp | 3 +- src/gui/popups/skillpopup.cpp | 2 +- src/gui/widgets/skillinfo.cpp | 191 -------------------------------------- src/gui/widgets/skillinfo.h | 99 -------------------- src/net/eathena/skillrecv.cpp | 3 +- src/resources/skill/skillinfo.cpp | 191 ++++++++++++++++++++++++++++++++++++++ src/resources/skill/skillinfo.h | 99 ++++++++++++++++++++ 12 files changed, 303 insertions(+), 301 deletions(-) delete mode 100644 src/gui/widgets/skillinfo.cpp delete mode 100644 src/gui/widgets/skillinfo.h create mode 100644 src/resources/skill/skillinfo.cpp create mode 100644 src/resources/skill/skillinfo.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d555931ef..22abd909c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -266,8 +266,8 @@ SET(SRCS gui/widgets/shortcutcontainer.h resources/skill/skilldata.cpp resources/skill/skilldata.h - gui/widgets/skillinfo.cpp - gui/widgets/skillinfo.h + resources/skill/skillinfo.cpp + resources/skill/skillinfo.h gui/widgets/skilllistbox.h gui/models/skillmodel.cpp gui/models/skillmodel.h diff --git a/src/Makefile.am b/src/Makefile.am index 02966844a..676f90bdf 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1031,8 +1031,8 @@ manaplus_SOURCES += main.cpp \ gui/widgets/shortcutcontainer.h \ resources/skill/skilldata.cpp \ resources/skill/skilldata.h \ - gui/widgets/skillinfo.cpp \ - gui/widgets/skillinfo.h \ + resources/skill/skillinfo.cpp \ + resources/skill/skillinfo.h \ gui/widgets/skilllistbox.h \ gui/widgets/tabs/shortcuttab.h \ gui/widgets/tabs/skilltab.h \ diff --git a/src/being/being.cpp b/src/being/being.cpp index fd4b37e2c..73e088fe7 100644 --- a/src/being/being.cpp +++ b/src/being/being.cpp @@ -91,11 +91,11 @@ #include "resources/map/map.h" #include "resources/skill/skilldata.h" +#include "resources/skill/skillinfo.h" #include "resources/sprite/animatedsprite.h" #include "gui/widgets/createwidget.h" -#include "gui/widgets/skillinfo.h" #include "gui/widgets/tabs/chat/langtab.h" diff --git a/src/dragdrop.h b/src/dragdrop.h index 9c5a6399f..e1f6ae9e8 100644 --- a/src/dragdrop.h +++ b/src/dragdrop.h @@ -28,11 +28,10 @@ #include "enums/dragdropsource.h" -#include "gui/widgets/skillinfo.h" - #include "resources/image/image.h" #include "resources/skill/skilldata.h" +#include "resources/skill/skillinfo.h" #include "localconsts.h" diff --git a/src/gui/models/skillmodel.h b/src/gui/models/skillmodel.h index d7695253d..8695e548d 100644 --- a/src/gui/models/skillmodel.h +++ b/src/gui/models/skillmodel.h @@ -23,9 +23,10 @@ #ifndef GUI_MODELS_SKILLMODEL_H #define GUI_MODELS_SKILLMODEL_H -#include "gui/widgets/skillinfo.h" #include "gui/models/listmodel.h" +#include "resources/skill/skillinfo.h" + #include "localconsts.h" class SkillModel final : public ListModel diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp index 7bed7446f..4c417036b 100644 --- a/src/gui/popups/popupmenu.cpp +++ b/src/gui/popups/popupmenu.cpp @@ -60,7 +60,6 @@ #include "gui/widgets/createwidget.h" #include "gui/widgets/progressbar.h" #include "gui/widgets/scrollarea.h" -#include "gui/widgets/skillinfo.h" #include "gui/widgets/textfield.h" #include "gui/widgets/tabs/chat/whispertab.h" @@ -92,6 +91,8 @@ #include "resources/map/mapitem.h" #include "resources/map/speciallayer.h" +#include "resources/skill/skillinfo.h" + #include "utils/copynpaste.h" #include "utils/gettext.h" #include "utils/process.h" diff --git a/src/gui/popups/skillpopup.cpp b/src/gui/popups/skillpopup.cpp index b88fa83ca..efd9e1f50 100644 --- a/src/gui/popups/skillpopup.cpp +++ b/src/gui/popups/skillpopup.cpp @@ -28,13 +28,13 @@ #include "gui/fonts/font.h" #include "gui/widgets/label.h" -#include "gui/widgets/skillinfo.h" #include "gui/widgets/textbox.h" #include "utils/gettext.h" #include "utils/stringutils.h" #include "resources/skill/skilldata.h" +#include "resources/skill/skillinfo.h" #include "debug.h" diff --git a/src/gui/widgets/skillinfo.cpp b/src/gui/widgets/skillinfo.cpp deleted file mode 100644 index 8c7fbefea..000000000 --- a/src/gui/widgets/skillinfo.cpp +++ /dev/null @@ -1,191 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2004-2009 The Mana World Development Team - * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011-2016 The ManaPlus Developers - * - * This file is part of The ManaPlus Client. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include "gui/widgets/skillinfo.h" - -#include "being/playerinfo.h" - -#include "gui/models/skillmodel.h" - -#include "utils/stringutils.h" - -#include "resources/skilltypelist.h" - -#include "resources/skill/skilldata.h" - -#include "debug.h" - -SkillInfo::SkillInfo() : - skillLevel(), - skillEffect(), - useButton(), - errorText(), - castingAction(), - castingRideAction(), - castingSkyAction(), - castingWaterAction(), - dataMap(), - model(nullptr), - data(nullptr), - level(0), - selectedLevel(0), - skillLevelWidth(0), - id(0), - range(0), - sp(0), - duration(0), - durationTime(0), - cooldown(0), - castingSrcEffectId(-1), - castingDstEffectId(-1), - type(SkillType::Unknown), - owner(SkillOwner::Player), - modifiable(Modifiable_false), - visible(Visible_false), - alwaysVisible(Visible_false), - useTextParameter(false) -{ - dataMap[0] = new SkillData(); - data = dataMap[0]; -} - -SkillInfo::~SkillInfo() -{ - FOR_EACH (SkillDataMapIter, it, dataMap) - delete (*it).second; - dataMap.clear(); -} - -void SkillInfo::update() -{ - const int baseLevel = PlayerInfo::getSkillLevel(id); - if (modifiable == Modifiable_false && baseLevel == 0) - { - if (visible == Visible_true) - { - visible = Visible_false; - if (model) - model->updateVisibilities(); - } - return; - } - - const bool updateVisibility = (visible == Visible_false); - visible = Visible_true; - - if (baseLevel == 0) - { - skillLevel.clear(); - } - else - { - if (!selectedLevel) - { - // TRANSLATORS: skill level - skillLevel = strprintf(_("Lvl: %d"), baseLevel); - } - else - { - // TRANSLATORS: skill level - skillLevel = strprintf(_("Lvl: %d / %d"), - selectedLevel, - baseLevel); - } - } - - // TRANSLATORS: skill type - const char *const typeStr = _("Type: %s"); - - if (type == SkillType::Unknown) - { - // TRANSLATORS: Skill type - skillEffect = strprintf(typeStr, _("Unknown")); - } - else - { - for (size_t f = 0; f < skillTypeListSize; f ++) - { - const SkillTypeEntry &item = skillTypeList[f]; - if ((item.type & type) != 0) - { - if (!skillEffect.empty()) - skillEffect.append(", "); - skillEffect.append(strprintf(typeStr, item.name)); - } - } - } - if (skillEffect.empty()) - { - // TRANSLATORS: Skill type - skillEffect = strprintf(typeStr, _("Unknown:")); - skillEffect.append(" ").append(toString(CAST_S32(type))); - } - - if (sp) - { - // TRANSLATORS: skill mana - skillEffect.append(strprintf(_(" / Mana: -%d"), sp)); - } - - if (range > 0) - { - if (!skillEffect.empty()) - skillEffect.append(" / "); - // TRANSLATORS: skill range - skillEffect.append(strprintf(_("Range: %d"), range)); - } - - level = baseLevel; - if (selectedLevel > level) - selectedLevel = level; - - skillLevelWidth = -1; - - if (updateVisibility && model) - model->updateVisibilities(); - - data = getData(level); - if (!data) - data = dataMap[0]; -} - - -void SkillInfo::addData(const int level1, SkillData *const data1) -{ - dataMap[level1] = data1; -} - -SkillData *SkillInfo::getData(const int level1) const -{ - const SkillDataMapCIter it = dataMap.find(level1); - if (it == dataMap.end()) - return nullptr; - return (*it).second; -} - -SkillData *SkillInfo::getData1(const int lev) const -{ - const SkillDataMapCIter it = dataMap.find(lev); - if (it == dataMap.end()) - return (*dataMap.begin()).second; - return (*it).second; -} diff --git a/src/gui/widgets/skillinfo.h b/src/gui/widgets/skillinfo.h deleted file mode 100644 index dc83a1a63..000000000 --- a/src/gui/widgets/skillinfo.h +++ /dev/null @@ -1,99 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2004-2009 The Mana World Development Team - * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011-2016 The ManaPlus Developers - * - * This file is part of The ManaPlus Client. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef GUI_WIDGETS_SKILLINFO_H -#define GUI_WIDGETS_SKILLINFO_H - -#include "enums/simpletypes/modifiable.h" -#include "enums/simpletypes/visible.h" - -#include "enums/resources/skillowner.h" -#include "enums/resources/skilltype.h" - -#include -#include -#include - -#include "localconsts.h" - -struct SkillData; - -class SkillModel; - -typedef std::map SkillDataMap; -typedef SkillDataMap::iterator SkillDataMapIter; -typedef SkillDataMap::const_iterator SkillDataMapCIter; - -struct SkillInfo final -{ - std::string skillLevel; - std::string skillEffect; - std::string useButton; - std::string errorText; - std::string castingAction; - std::string castingRideAction; - std::string castingSkyAction; - std::string castingWaterAction; - SkillDataMap dataMap; - SkillModel *model; - SkillData *data; - int level; - int selectedLevel; - int skillLevelWidth; - unsigned int id; - int range; - int sp; - int duration; - int durationTime; - int cooldown; - int castingSrcEffectId; - int castingDstEffectId; - SkillType::SkillType type; - SkillOwner::Type owner; - Modifiable modifiable; - Visible visible; - Visible alwaysVisible; - bool useTextParameter; - - SkillInfo(); - A_DELETE_COPY(SkillInfo) - ~SkillInfo(); - - void update(); - - SkillData *getData(const int level) const A_WARN_UNUSED; - SkillData *getData1(const int level) const A_WARN_UNUSED; - - void addData(const int level, SkillData *const data); - - bool isUsable() const A_WARN_UNUSED - { - return type == SkillType::Attack - || type == SkillType::Self - || type == SkillType::Support; - } -}; - -typedef std::vector SkillList; -typedef SkillList::iterator SkillListIter; - -#endif // GUI_WIDGETS_SKILLINFO_H diff --git a/src/net/eathena/skillrecv.cpp b/src/net/eathena/skillrecv.cpp index f937deb22..254676f77 100644 --- a/src/net/eathena/skillrecv.cpp +++ b/src/net/eathena/skillrecv.cpp @@ -32,7 +32,6 @@ #include "enums/resources/notifytypes.h" #include "gui/widgets/createwidget.h" -#include "gui/widgets/skillinfo.h" #include "gui/windows/skilldialog.h" #include "gui/windows/textselectdialog.h" @@ -47,6 +46,8 @@ #include "resources/db/itemdb.h" +#include "resources/skill/skillinfo.h" + #include "utils/gettext.h" #include "utils/stringutils.h" diff --git a/src/resources/skill/skillinfo.cpp b/src/resources/skill/skillinfo.cpp new file mode 100644 index 000000000..c65fadc2b --- /dev/null +++ b/src/resources/skill/skillinfo.cpp @@ -0,0 +1,191 @@ +/* + * The ManaPlus Client + * Copyright (C) 2004-2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2016 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "resources/skill/skillinfo.h" + +#include "being/playerinfo.h" + +#include "gui/models/skillmodel.h" + +#include "utils/stringutils.h" + +#include "resources/skilltypelist.h" + +#include "resources/skill/skilldata.h" + +#include "debug.h" + +SkillInfo::SkillInfo() : + skillLevel(), + skillEffect(), + useButton(), + errorText(), + castingAction(), + castingRideAction(), + castingSkyAction(), + castingWaterAction(), + dataMap(), + model(nullptr), + data(nullptr), + level(0), + selectedLevel(0), + skillLevelWidth(0), + id(0), + range(0), + sp(0), + duration(0), + durationTime(0), + cooldown(0), + castingSrcEffectId(-1), + castingDstEffectId(-1), + type(SkillType::Unknown), + owner(SkillOwner::Player), + modifiable(Modifiable_false), + visible(Visible_false), + alwaysVisible(Visible_false), + useTextParameter(false) +{ + dataMap[0] = new SkillData(); + data = dataMap[0]; +} + +SkillInfo::~SkillInfo() +{ + FOR_EACH (SkillDataMapIter, it, dataMap) + delete (*it).second; + dataMap.clear(); +} + +void SkillInfo::update() +{ + const int baseLevel = PlayerInfo::getSkillLevel(id); + if (modifiable == Modifiable_false && baseLevel == 0) + { + if (visible == Visible_true) + { + visible = Visible_false; + if (model) + model->updateVisibilities(); + } + return; + } + + const bool updateVisibility = (visible == Visible_false); + visible = Visible_true; + + if (baseLevel == 0) + { + skillLevel.clear(); + } + else + { + if (!selectedLevel) + { + // TRANSLATORS: skill level + skillLevel = strprintf(_("Lvl: %d"), baseLevel); + } + else + { + // TRANSLATORS: skill level + skillLevel = strprintf(_("Lvl: %d / %d"), + selectedLevel, + baseLevel); + } + } + + // TRANSLATORS: skill type + const char *const typeStr = _("Type: %s"); + + if (type == SkillType::Unknown) + { + // TRANSLATORS: Skill type + skillEffect = strprintf(typeStr, _("Unknown")); + } + else + { + for (size_t f = 0; f < skillTypeListSize; f ++) + { + const SkillTypeEntry &item = skillTypeList[f]; + if ((item.type & type) != 0) + { + if (!skillEffect.empty()) + skillEffect.append(", "); + skillEffect.append(strprintf(typeStr, item.name)); + } + } + } + if (skillEffect.empty()) + { + // TRANSLATORS: Skill type + skillEffect = strprintf(typeStr, _("Unknown:")); + skillEffect.append(" ").append(toString(CAST_S32(type))); + } + + if (sp) + { + // TRANSLATORS: skill mana + skillEffect.append(strprintf(_(" / Mana: -%d"), sp)); + } + + if (range > 0) + { + if (!skillEffect.empty()) + skillEffect.append(" / "); + // TRANSLATORS: skill range + skillEffect.append(strprintf(_("Range: %d"), range)); + } + + level = baseLevel; + if (selectedLevel > level) + selectedLevel = level; + + skillLevelWidth = -1; + + if (updateVisibility && model) + model->updateVisibilities(); + + data = getData(level); + if (!data) + data = dataMap[0]; +} + + +void SkillInfo::addData(const int level1, SkillData *const data1) +{ + dataMap[level1] = data1; +} + +SkillData *SkillInfo::getData(const int level1) const +{ + const SkillDataMapCIter it = dataMap.find(level1); + if (it == dataMap.end()) + return nullptr; + return (*it).second; +} + +SkillData *SkillInfo::getData1(const int lev) const +{ + const SkillDataMapCIter it = dataMap.find(lev); + if (it == dataMap.end()) + return (*dataMap.begin()).second; + return (*it).second; +} diff --git a/src/resources/skill/skillinfo.h b/src/resources/skill/skillinfo.h new file mode 100644 index 000000000..dc83a1a63 --- /dev/null +++ b/src/resources/skill/skillinfo.h @@ -0,0 +1,99 @@ +/* + * The ManaPlus Client + * Copyright (C) 2004-2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2016 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef GUI_WIDGETS_SKILLINFO_H +#define GUI_WIDGETS_SKILLINFO_H + +#include "enums/simpletypes/modifiable.h" +#include "enums/simpletypes/visible.h" + +#include "enums/resources/skillowner.h" +#include "enums/resources/skilltype.h" + +#include +#include +#include + +#include "localconsts.h" + +struct SkillData; + +class SkillModel; + +typedef std::map SkillDataMap; +typedef SkillDataMap::iterator SkillDataMapIter; +typedef SkillDataMap::const_iterator SkillDataMapCIter; + +struct SkillInfo final +{ + std::string skillLevel; + std::string skillEffect; + std::string useButton; + std::string errorText; + std::string castingAction; + std::string castingRideAction; + std::string castingSkyAction; + std::string castingWaterAction; + SkillDataMap dataMap; + SkillModel *model; + SkillData *data; + int level; + int selectedLevel; + int skillLevelWidth; + unsigned int id; + int range; + int sp; + int duration; + int durationTime; + int cooldown; + int castingSrcEffectId; + int castingDstEffectId; + SkillType::SkillType type; + SkillOwner::Type owner; + Modifiable modifiable; + Visible visible; + Visible alwaysVisible; + bool useTextParameter; + + SkillInfo(); + A_DELETE_COPY(SkillInfo) + ~SkillInfo(); + + void update(); + + SkillData *getData(const int level) const A_WARN_UNUSED; + SkillData *getData1(const int level) const A_WARN_UNUSED; + + void addData(const int level, SkillData *const data); + + bool isUsable() const A_WARN_UNUSED + { + return type == SkillType::Attack + || type == SkillType::Self + || type == SkillType::Support; + } +}; + +typedef std::vector SkillList; +typedef SkillList::iterator SkillListIter; + +#endif // GUI_WIDGETS_SKILLINFO_H -- cgit v1.2.3-70-g09d2