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/resources/skill/skilldata.cpp | 71 +++++++++++++++++++++++++++++++++++++++ src/resources/skill/skilldata.h | 56 ++++++++++++++++++++++++++++++ 2 files changed, 127 insertions(+) create mode 100644 src/resources/skill/skilldata.cpp create mode 100644 src/resources/skill/skilldata.h (limited to 'src/resources') diff --git a/src/resources/skill/skilldata.cpp b/src/resources/skill/skilldata.cpp new file mode 100644 index 000000000..65d454260 --- /dev/null +++ b/src/resources/skill/skilldata.cpp @@ -0,0 +1,71 @@ +/* + * 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/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/resources/skill/skilldata.h b/src/resources/skill/skilldata.h new file mode 100644 index 000000000..20365593f --- /dev/null +++ b/src/resources/skill/skilldata.h @@ -0,0 +1,56 @@ +/* + * 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 -- cgit v1.2.3-60-g2f50