From 58c6a03a6672a1f70c694e56da539930f22c8cdd Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 15 Aug 2016 17:15:39 +0300 Subject: Move skillowner.h into skill directory. --- src/CMakeLists.txt | 2 +- src/Makefile.am | 2 +- src/enums/resources/skill/skillowner.h | 35 ++++++++++++++++++++++++++++++++++ src/enums/resources/skillowner.h | 35 ---------------------------------- src/gui/windows/skilldialog.h | 2 +- src/resources/skill/skillinfo.h | 2 +- 6 files changed, 39 insertions(+), 39 deletions(-) create mode 100644 src/enums/resources/skill/skillowner.h delete mode 100644 src/enums/resources/skillowner.h (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2f3e2ce39..11c522a65 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -780,7 +780,7 @@ SET(SRCS resources/skill/skilltypelist.h const/net/skill.h const/resources/skill.h - enums/resources/skillowner.h + enums/resources/skill/skillowner.h enums/resources/skilltype.h enums/resources/skilltype2.h resources/db/sounddb.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 20644b120..92da6e31d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -444,7 +444,7 @@ SRC += events/actionevent.h \ resources/skill/skilltypelist.h \ const/net/skill.h \ const/resources/skill.h \ - enums/resources/skillowner.h \ + enums/resources/skill/skillowner.h \ enums/resources/skilltype.h \ enums/resources/skilltype2.h \ resources/soundeffect.cpp \ diff --git a/src/enums/resources/skill/skillowner.h b/src/enums/resources/skill/skillowner.h new file mode 100644 index 000000000..c82e42dbb --- /dev/null +++ b/src/enums/resources/skill/skillowner.h @@ -0,0 +1,35 @@ +/* + * The ManaPlus Client + * 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 ENUMS_RESOURCES_SKILL_SKILLOWNER_H +#define ENUMS_RESOURCES_SKILL_SKILLOWNER_H + +namespace SkillOwner +{ + enum Type + { + Player = 0, + Mercenary = 1, + Homunculus = 2, + Guild = 3 + }; +} // namespace SkillOwner + +#endif // ENUMS_RESOURCES_SKILL_SKILLOWNER_H diff --git a/src/enums/resources/skillowner.h b/src/enums/resources/skillowner.h deleted file mode 100644 index 30301b423..000000000 --- a/src/enums/resources/skillowner.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * The ManaPlus Client - * 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 ENUMS_RESOURCES_SKILLOWNER_H -#define ENUMS_RESOURCES_SKILLOWNER_H - -namespace SkillOwner -{ - enum Type - { - Player = 0, - Mercenary = 1, - Homunculus = 2, - Guild = 3 - }; -} // namespace SkillOwner - -#endif // ENUMS_RESOURCES_SKILLOWNER_H diff --git a/src/gui/windows/skilldialog.h b/src/gui/windows/skilldialog.h index 59981c403..db18087c5 100644 --- a/src/gui/windows/skilldialog.h +++ b/src/gui/windows/skilldialog.h @@ -28,10 +28,10 @@ #include "enums/simpletypes/autotarget.h" #include "enums/simpletypes/modifiable.h" -#include "enums/resources/skillowner.h" #include "enums/resources/skilltype.h" #include "enums/resources/skill/casttype.h" +#include "enums/resources/skill/skillowner.h" #include "listeners/actionlistener.h" diff --git a/src/resources/skill/skillinfo.h b/src/resources/skill/skillinfo.h index b49d79e2c..7f50e03ce 100644 --- a/src/resources/skill/skillinfo.h +++ b/src/resources/skill/skillinfo.h @@ -26,10 +26,10 @@ #include "enums/simpletypes/modifiable.h" #include "enums/simpletypes/visible.h" -#include "enums/resources/skillowner.h" #include "enums/resources/skilltype.h" #include "enums/resources/skill/casttype.h" +#include "enums/resources/skill/skillowner.h" #include #include -- cgit v1.2.3-70-g09d2