Move skilltype.h and skilltype2.h into skill directory.

8 files changed, 14 insertions, 16 deletions

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/skilltype.h b/src/enums/resources/skill/skilltype.h
index bc2b75db6..911f4e05c 100644
--- a/src/enums/resources/skilltype.h
+++ b/src/enums/resources/skill/skilltype.h
@@ -18,8 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef ENUMS_RESOURCES_SKILLTYPE_H
-#define ENUMS_RESOURCES_SKILLTYPE_H
+#ifndef ENUMS_RESOURCES_SKILL_SKILLTYPE_H
+#define ENUMS_RESOURCES_SKILL_SKILLTYPE_H
 
 // aka inf
 namespace SkillType
@@ -36,4 +36,4 @@ namespace SkillType
     };
 }  // namespace SkillType
 
-#endif  // ENUMS_RESOURCES_SKILLTYPE_H
+#endif  // ENUMS_RESOURCES_SKILL_SKILLTYPE_H
diff --git a/src/enums/resources/skilltype2.h b/src/enums/resources/skill/skilltype2.h
index 30bf9187b..8f533bc9a 100644
--- a/src/enums/resources/skilltype2.h
+++ b/src/enums/resources/skill/skilltype2.h
@@ -18,8 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef ENUMS_RESOURCES_SKILLTYPE2_H
-#define ENUMS_RESOURCES_SKILLTYPE2_H
+#ifndef ENUMS_RESOURCES_SKILL_SKILLTYPE2_H
+#define ENUMS_RESOURCES_SKILL_SKILLTYPE2_H
 
 // aka inf2
 namespace SkillType2
@@ -48,4 +48,4 @@ namespace SkillType2
     };
 }  // namespace SkillType2
 
-#endif  // ENUMS_RESOURCES_SKILLTYPE2_H
+#endif  // ENUMS_RESOURCES_SKILL_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 <string>
 #include <vector>
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"