From 191938e51d9e9a65b302bf541d706615a22b31a0 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 18 Jul 2016 16:11:04 +0300 Subject: Move skilltypelist into skill directory. --- src/CMakeLists.txt | 2 +- src/Makefile.am | 2 +- src/resources/skill/skillinfo.cpp | 3 +-- src/resources/skill/skilltypelist.h | 48 +++++++++++++++++++++++++++++++++++++ src/resources/skilltypelist.h | 48 ------------------------------------- 5 files changed, 51 insertions(+), 52 deletions(-) create mode 100644 src/resources/skill/skilltypelist.h delete mode 100644 src/resources/skilltypelist.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8d9117699..062b94540 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -766,7 +766,7 @@ SET(SRCS resources/sdlscreenshothelper.cpp resources/sdlscreenshothelper.h resources/skill/skilltypeentry.h - resources/skilltypelist.h + resources/skill/skilltypelist.h const/net/skill.h const/resources/skill.h enums/resources/skillowner.h diff --git a/src/Makefile.am b/src/Makefile.am index aa7971ae2..7bf77c690 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -437,7 +437,7 @@ SRC += events/actionevent.h \ resources/sdlscreenshothelper.cpp \ resources/sdlscreenshothelper.h \ resources/skill/skilltypeentry.h \ - resources/skilltypelist.h \ + resources/skill/skilltypelist.h \ const/net/skill.h \ const/resources/skill.h \ enums/resources/skillowner.h \ diff --git a/src/resources/skill/skillinfo.cpp b/src/resources/skill/skillinfo.cpp index c65fadc2b..1500bf17a 100644 --- a/src/resources/skill/skillinfo.cpp +++ b/src/resources/skill/skillinfo.cpp @@ -28,9 +28,8 @@ #include "utils/stringutils.h" -#include "resources/skilltypelist.h" - #include "resources/skill/skilldata.h" +#include "resources/skill/skilltypelist.h" #include "debug.h" diff --git a/src/resources/skill/skilltypelist.h b/src/resources/skill/skilltypelist.h new file mode 100644 index 000000000..1c5c93704 --- /dev/null +++ b/src/resources/skill/skilltypelist.h @@ -0,0 +1,48 @@ +/* + * The ManaPlus Client + * Copyright (C) 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 RESOURCES_SKILLTYPELIST_H +#define RESOURCES_SKILLTYPELIST_H + +#include "utils/gettext.h" + +#include "resources/skill/skilltypeentry.h" + +#include "localconsts.h" + +const size_t skillTypeListSize = 6; + +SkillTypeEntry skillTypeList[skillTypeListSize] = +{ + // TRANSLATORS: Skill type + { SkillType::Attack, N_("Attack") }, + // TRANSLATORS: Skill type + { SkillType::Ground, N_("Ground") }, + // TRANSLATORS: Skill type + { SkillType::Self, N_("Self") }, + // TRANSLATORS: Skill type + { SkillType::Unused, N_("Unused") }, + // TRANSLATORS: Skill type + { SkillType::Support, N_("Support") }, + // TRANSLATORS: Skill type + { SkillType::TargetTrap, N_("TargetTrap") } +}; + +#endif // RESOURCES_SKILLTYPELIST_H diff --git a/src/resources/skilltypelist.h b/src/resources/skilltypelist.h deleted file mode 100644 index 1c5c93704..000000000 --- a/src/resources/skilltypelist.h +++ /dev/null @@ -1,48 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 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 RESOURCES_SKILLTYPELIST_H -#define RESOURCES_SKILLTYPELIST_H - -#include "utils/gettext.h" - -#include "resources/skill/skilltypeentry.h" - -#include "localconsts.h" - -const size_t skillTypeListSize = 6; - -SkillTypeEntry skillTypeList[skillTypeListSize] = -{ - // TRANSLATORS: Skill type - { SkillType::Attack, N_("Attack") }, - // TRANSLATORS: Skill type - { SkillType::Ground, N_("Ground") }, - // TRANSLATORS: Skill type - { SkillType::Self, N_("Self") }, - // TRANSLATORS: Skill type - { SkillType::Unused, N_("Unused") }, - // TRANSLATORS: Skill type - { SkillType::Support, N_("Support") }, - // TRANSLATORS: Skill type - { SkillType::TargetTrap, N_("TargetTrap") } -}; - -#endif // RESOURCES_SKILLTYPELIST_H -- cgit v1.2.3-70-g09d2