From 9c4835ccba3afbbd9cf4a3fe31f22c924f5b6a81 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 15 Aug 2016 17:39:13 +0300 Subject: Move skilltype.h and skilltype2.h into skill directory. --- src/CMakeLists.txt | 4 +-- src/Makefile.am | 4 +-- src/enums/resources/skill/skilltype.h | 39 ++++++++++++++++++++++++++ src/enums/resources/skill/skilltype2.h | 51 ++++++++++++++++++++++++++++++++++ src/enums/resources/skilltype.h | 39 -------------------------- src/enums/resources/skilltype2.h | 51 ---------------------------------- src/gui/windows/skilldialog.h | 3 +- src/net/eathena/beingrecv.h | 2 +- src/resources/skill/skillinfo.h | 3 +- src/resources/skill/skilltypeentry.h | 2 +- 10 files changed, 98 insertions(+), 100 deletions(-) create mode 100644 src/enums/resources/skill/skilltype.h create mode 100644 src/enums/resources/skill/skilltype2.h delete mode 100644 src/enums/resources/skilltype.h delete mode 100644 src/enums/resources/skilltype2.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 11c522a65..34e564376 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -781,8 +781,8 @@ SET(SRCS const/net/skill.h const/resources/skill.h enums/resources/skill/skillowner.h - enums/resources/skilltype.h - enums/resources/skilltype2.h + enums/resources/skill/skilltype.h + enums/resources/skill/skilltype2.h resources/db/sounddb.cpp resources/db/sounddb.h resources/db/statdb.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 92da6e31d..d9c02699c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -445,8 +445,8 @@ SRC += events/actionevent.h \ const/net/skill.h \ const/resources/skill.h \ enums/resources/skill/skillowner.h \ - enums/resources/skilltype.h \ - enums/resources/skilltype2.h \ + enums/resources/skill/skilltype.h \ + enums/resources/skill/skilltype2.h \ resources/soundeffect.cpp \ resources/soundeffect.h \ resources/soundinfo.h \ diff --git a/src/enums/resources/skill/skilltype.h b/src/enums/resources/skill/skilltype.h new file mode 100644 index 000000000..911f4e05c --- /dev/null +++ b/src/enums/resources/skill/skilltype.h @@ -0,0 +1,39 @@ +/* + * 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_SKILLTYPE_H +#define ENUMS_RESOURCES_SKILL_SKILLTYPE_H + +// aka inf +namespace SkillType +{ + enum SkillType + { + Unknown = 0, + Attack = 1, + Ground = 2, + Self = 4, + Unused = 8, + Support = 16, + TargetTrap = 32 + }; +} // namespace SkillType + +#endif // ENUMS_RESOURCES_SKILL_SKILLTYPE_H diff --git a/src/enums/resources/skill/skilltype2.h b/src/enums/resources/skill/skilltype2.h new file mode 100644 index 000000000..8f533bc9a --- /dev/null +++ b/src/enums/resources/skill/skilltype2.h @@ -0,0 +1,51 @@ +/* + * 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 ENUMS_RESOURCES_SKILL_SKILLTYPE2_H +#define ENUMS_RESOURCES_SKILL_SKILLTYPE2_H + +// aka inf2 +namespace SkillType2 +{ + enum SkillType2 + { + Unknown = 0, + Quest = 1, + Npc = 2, + Wedding = 4, + Spirit = 8, + Guild = 16, + SongDance = 32, + Ensemble = 64, + Trap = 128, + TargetSelf = 256, + NoTargetSelf = 512, + PartyOnly = 1024, + GuildOnly = 2048, + NoEnemy = 4096, + NoLandProtector = 8192, + Chorus = 16384, + FreeCastNormal = 32768, + FreeCastReduced = 65536, + FreeCastAny = 98304 + }; +} // namespace SkillType2 + +#endif // ENUMS_RESOURCES_SKILL_SKILLTYPE2_H diff --git a/src/enums/resources/skilltype.h b/src/enums/resources/skilltype.h deleted file mode 100644 index bc2b75db6..000000000 --- a/src/enums/resources/skilltype.h +++ /dev/null @@ -1,39 +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_SKILLTYPE_H -#define ENUMS_RESOURCES_SKILLTYPE_H - -// aka inf -namespace SkillType -{ - enum SkillType - { - Unknown = 0, - Attack = 1, - Ground = 2, - Self = 4, - Unused = 8, - Support = 16, - TargetTrap = 32 - }; -} // namespace SkillType - -#endif // ENUMS_RESOURCES_SKILLTYPE_H diff --git a/src/enums/resources/skilltype2.h b/src/enums/resources/skilltype2.h deleted file mode 100644 index 30bf9187b..000000000 --- a/src/enums/resources/skilltype2.h +++ /dev/null @@ -1,51 +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 ENUMS_RESOURCES_SKILLTYPE2_H -#define ENUMS_RESOURCES_SKILLTYPE2_H - -// aka inf2 -namespace SkillType2 -{ - enum SkillType2 - { - Unknown = 0, - Quest = 1, - Npc = 2, - Wedding = 4, - Spirit = 8, - Guild = 16, - SongDance = 32, - Ensemble = 64, - Trap = 128, - TargetSelf = 256, - NoTargetSelf = 512, - PartyOnly = 1024, - GuildOnly = 2048, - NoEnemy = 4096, - NoLandProtector = 8192, - Chorus = 16384, - FreeCastNormal = 32768, - FreeCastReduced = 65536, - FreeCastAny = 98304 - }; -} // namespace SkillType2 - -#endif // ENUMS_RESOURCES_SKILLTYPE2_H diff --git a/src/gui/windows/skilldialog.h b/src/gui/windows/skilldialog.h index db18087c5..aa3f479c1 100644 --- a/src/gui/windows/skilldialog.h +++ b/src/gui/windows/skilldialog.h @@ -28,10 +28,9 @@ #include "enums/simpletypes/autotarget.h" #include "enums/simpletypes/modifiable.h" -#include "enums/resources/skilltype.h" - #include "enums/resources/skill/casttype.h" #include "enums/resources/skill/skillowner.h" +#include "enums/resources/skill/skilltype.h" #include "listeners/actionlistener.h" diff --git a/src/net/eathena/beingrecv.h b/src/net/eathena/beingrecv.h index 6809d704a..b1802ffa0 100644 --- a/src/net/eathena/beingrecv.h +++ b/src/net/eathena/beingrecv.h @@ -25,7 +25,7 @@ #include "net/eathena/beingtype.h" -#include "enums/resources/skilltype2.h" +#include "enums/resources/skill/skilltype2.h" #include "enums/simpletypes/beingid.h" diff --git a/src/resources/skill/skillinfo.h b/src/resources/skill/skillinfo.h index 7f50e03ce..689ab20a0 100644 --- a/src/resources/skill/skillinfo.h +++ b/src/resources/skill/skillinfo.h @@ -26,10 +26,9 @@ #include "enums/simpletypes/modifiable.h" #include "enums/simpletypes/visible.h" -#include "enums/resources/skilltype.h" - #include "enums/resources/skill/casttype.h" #include "enums/resources/skill/skillowner.h" +#include "enums/resources/skill/skilltype.h" #include #include diff --git a/src/resources/skill/skilltypeentry.h b/src/resources/skill/skilltypeentry.h index bbf0bd016..277657299 100644 --- a/src/resources/skill/skilltypeentry.h +++ b/src/resources/skill/skilltypeentry.h @@ -21,7 +21,7 @@ #ifndef RESOURCES_SKILLTYPEENTRY_H #define RESOURCES_SKILLTYPEENTRY_H -#include "enums/resources/skilltype.h" +#include "enums/resources/skill/skilltype.h" #include "localconsts.h" -- cgit v1.2.3-60-g2f50