summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-07-18 16:11:04 +0300
committerAndrei Karas <akaras@inbox.ru>2016-07-18 16:11:04 +0300
commit191938e51d9e9a65b302bf541d706615a22b31a0 (patch)
tree935f3a725cba8643a2e19fa3721d0c6ba19e991e
parentff78d9fe36ec63d1b5120fb06cda1631332b7060 (diff)
downloadmanaplus-191938e51d9e9a65b302bf541d706615a22b31a0.tar.gz
manaplus-191938e51d9e9a65b302bf541d706615a22b31a0.tar.bz2
manaplus-191938e51d9e9a65b302bf541d706615a22b31a0.tar.xz
manaplus-191938e51d9e9a65b302bf541d706615a22b31a0.zip
Move skilltypelist into skill directory.
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/resources/skill/skillinfo.cpp3
-rw-r--r--src/resources/skill/skilltypelist.h (renamed from src/resources/skilltypelist.h)0
4 files changed, 3 insertions, 4 deletions
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/skilltypelist.h b/src/resources/skill/skilltypelist.h
index 1c5c93704..1c5c93704 100644
--- a/src/resources/skilltypelist.h
+++ b/src/resources/skill/skilltypelist.h