summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-07-18 15:57:55 +0300
committerAndrei Karas <akaras@inbox.ru>2016-07-18 15:57:55 +0300
commite02f97d2e05f5dc4b012cb946af45c9594617202 (patch)
treee194b3cb53cd8583af4b2043d242a2baa798a0ed /src/gui
parentf9f506fcf38e87f34d8a48af859889279d391713 (diff)
downloadplus-e02f97d2e05f5dc4b012cb946af45c9594617202.tar.gz
plus-e02f97d2e05f5dc4b012cb946af45c9594617202.tar.bz2
plus-e02f97d2e05f5dc4b012cb946af45c9594617202.tar.xz
plus-e02f97d2e05f5dc4b012cb946af45c9594617202.zip
Move skilldata into resources/skill directory.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/models/skillmodel.cpp2
-rw-r--r--src/gui/popups/skillpopup.cpp3
-rw-r--r--src/gui/widgets/skilldata.cpp71
-rw-r--r--src/gui/widgets/skilldata.h56
-rw-r--r--src/gui/widgets/skillinfo.cpp4
5 files changed, 5 insertions, 131 deletions
diff --git a/src/gui/models/skillmodel.cpp b/src/gui/models/skillmodel.cpp
index 7e49de9a3..7f130addd 100644
--- a/src/gui/models/skillmodel.cpp
+++ b/src/gui/models/skillmodel.cpp
@@ -22,7 +22,7 @@
#include "gui/models/skillmodel.h"
-#include "gui/widgets/skilldata.h"
+#include "resources/skill/skilldata.h"
#include "debug.h"
diff --git a/src/gui/popups/skillpopup.cpp b/src/gui/popups/skillpopup.cpp
index 879e48a80..b88fa83ca 100644
--- a/src/gui/popups/skillpopup.cpp
+++ b/src/gui/popups/skillpopup.cpp
@@ -28,13 +28,14 @@
#include "gui/fonts/font.h"
#include "gui/widgets/label.h"
-#include "gui/widgets/skilldata.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 "debug.h"
SkillPopup *skillPopup = nullptr;
diff --git a/src/gui/widgets/skilldata.cpp b/src/gui/widgets/skilldata.cpp
deleted file mode 100644
index 3b8328474..000000000
--- a/src/gui/widgets/skilldata.cpp
+++ /dev/null
@@ -1,71 +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 <http://www.gnu.org/licenses/>.
- */
-
-#include "gui/widgets/skilldata.h"
-
-#include "configuration.h"
-
-#include "gui/theme.h"
-
-#include "resources/image/image.h"
-
-#include "resources/loaders/imageloader.h"
-
-#include "debug.h"
-
-SkillData::SkillData() :
- name(),
- shortName(),
- dispName(),
- description(),
- icon(nullptr),
- particle(),
- invokeCmd(),
- soundHit(std::string(), 0),
- soundMiss(std::string(), 0),
- updateEffectId(-1),
- removeEffectId(-1),
- hitEffectId(-1),
- missEffectId(-1)
-{
-}
-
-SkillData::~SkillData()
-{
- if (icon)
- {
- icon->decRef();
- icon = nullptr;
- }
-}
-
-void SkillData::setIcon(const std::string &iconPath)
-{
- if (!iconPath.empty())
- icon = Loader::getImage(iconPath);
-
- if (!icon)
- {
- icon = Theme::getImageFromTheme(
- paths.getStringValue("unknownItemFile"));
- }
-}
diff --git a/src/gui/widgets/skilldata.h b/src/gui/widgets/skilldata.h
deleted file mode 100644
index 20365593f..000000000
--- a/src/gui/widgets/skilldata.h
+++ /dev/null
@@ -1,56 +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 <http://www.gnu.org/licenses/>.
- */
-
-#ifndef GUI_WIDGETS_SKILLDATA_H
-#define GUI_WIDGETS_SKILLDATA_H
-
-#include "resources/soundinfo.h"
-
-class Image;
-
-struct SkillData final
-{
- std::string name;
- std::string shortName;
- std::string dispName;
- std::string description;
- Image *icon;
-
- std::string particle;
- std::string invokeCmd;
-
- SoundInfo soundHit;
- SoundInfo soundMiss;
-
- int updateEffectId;
- int removeEffectId;
- int hitEffectId;
- int missEffectId;
-
- SkillData();
- A_DELETE_COPY(SkillData)
- ~SkillData();
-
- void setIcon(const std::string &iconPath);
-};
-
-#endif // GUI_WIDGETS_SKILLDATA_H
diff --git a/src/gui/widgets/skillinfo.cpp b/src/gui/widgets/skillinfo.cpp
index 906aff101..8c7fbefea 100644
--- a/src/gui/widgets/skillinfo.cpp
+++ b/src/gui/widgets/skillinfo.cpp
@@ -24,14 +24,14 @@
#include "being/playerinfo.h"
-#include "gui/widgets/skilldata.h"
-
#include "gui/models/skillmodel.h"
#include "utils/stringutils.h"
#include "resources/skilltypelist.h"
+#include "resources/skill/skilldata.h"
+
#include "debug.h"
SkillInfo::SkillInfo() :