From e02f97d2e05f5dc4b012cb946af45c9594617202 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 18 Jul 2016 15:57:55 +0300 Subject: Move skilldata into resources/skill directory. --- src/gui/widgets/skilldata.cpp | 71 ------------------------------------------- src/gui/widgets/skilldata.h | 56 ---------------------------------- src/gui/widgets/skillinfo.cpp | 4 +-- 3 files changed, 2 insertions(+), 129 deletions(-) delete mode 100644 src/gui/widgets/skilldata.cpp delete mode 100644 src/gui/widgets/skilldata.h (limited to 'src/gui/widgets') 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 . - */ - -#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 . - */ - -#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() : -- cgit v1.2.3-70-g09d2