From ff78d9fe36ec63d1b5120fb06cda1631332b7060 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 18 Jul 2016 16:09:05 +0300 Subject: Move skilltypeentry into skill directory. --- src/CMakeLists.txt | 2 +- src/Makefile.am | 2 +- src/resources/skill/skilltypeentry.h | 34 ++++++++++++++++++++++++++++++++++ src/resources/skilltypeentry.h | 34 ---------------------------------- src/resources/skilltypelist.h | 2 +- 5 files changed, 37 insertions(+), 37 deletions(-) create mode 100644 src/resources/skill/skilltypeentry.h delete mode 100644 src/resources/skilltypeentry.h (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 22abd909c..8d9117699 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -765,7 +765,7 @@ SET(SRCS resources/sdlmusic.h resources/sdlscreenshothelper.cpp resources/sdlscreenshothelper.h - resources/skilltypeentry.h + resources/skill/skilltypeentry.h resources/skilltypelist.h const/net/skill.h const/resources/skill.h diff --git a/src/Makefile.am b/src/Makefile.am index 676f90bdf..aa7971ae2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -436,7 +436,7 @@ SRC += events/actionevent.h \ resources/sdlmusic.h \ resources/sdlscreenshothelper.cpp \ resources/sdlscreenshothelper.h \ - resources/skilltypeentry.h \ + resources/skill/skilltypeentry.h \ resources/skilltypelist.h \ const/net/skill.h \ const/resources/skill.h \ diff --git a/src/resources/skill/skilltypeentry.h b/src/resources/skill/skilltypeentry.h new file mode 100644 index 000000000..bbf0bd016 --- /dev/null +++ b/src/resources/skill/skilltypeentry.h @@ -0,0 +1,34 @@ +/* + * 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_SKILLTYPEENTRY_H +#define RESOURCES_SKILLTYPEENTRY_H + +#include "enums/resources/skilltype.h" + +#include "localconsts.h" + +struct SkillTypeEntry final +{ + const SkillType::SkillType type; + const char *const name; +}; + +#endif // RESOURCES_SKILLTYPEENTRY_H diff --git a/src/resources/skilltypeentry.h b/src/resources/skilltypeentry.h deleted file mode 100644 index bbf0bd016..000000000 --- a/src/resources/skilltypeentry.h +++ /dev/null @@ -1,34 +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_SKILLTYPEENTRY_H -#define RESOURCES_SKILLTYPEENTRY_H - -#include "enums/resources/skilltype.h" - -#include "localconsts.h" - -struct SkillTypeEntry final -{ - const SkillType::SkillType type; - const char *const name; -}; - -#endif // RESOURCES_SKILLTYPEENTRY_H diff --git a/src/resources/skilltypelist.h b/src/resources/skilltypelist.h index dee4bc02c..1c5c93704 100644 --- a/src/resources/skilltypelist.h +++ b/src/resources/skilltypelist.h @@ -23,7 +23,7 @@ #include "utils/gettext.h" -#include "resources/skilltypeentry.h" +#include "resources/skill/skilltypeentry.h" #include "localconsts.h" -- cgit v1.2.3-60-g2f50