summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-06-29 20:55:14 +0300
committerAndrei Karas <akaras@inbox.ru>2016-06-30 00:03:19 +0300
commit370a8245ae3fbbfe449000b6bdaab366d08d925e (patch)
tree406edeaf4092faf92fb1e80040502be4ad69cebc
parent12a8d0a76439f0e5a0c548fbe2752fcb144b10be (diff)
downloadplus-370a8245ae3fbbfe449000b6bdaab366d08d925e.tar.gz
plus-370a8245ae3fbbfe449000b6bdaab366d08d925e.tar.bz2
plus-370a8245ae3fbbfe449000b6bdaab366d08d925e.tar.xz
plus-370a8245ae3fbbfe449000b6bdaab366d08d925e.zip
Move itemdbstat.h from db into resources directory.
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/resources/db/itemdb.cpp2
-rw-r--r--src/resources/db/statdb.h2
-rw-r--r--src/resources/itemdbstat.h (renamed from src/resources/db/itemdbstat.h)0
5 files changed, 4 insertions, 4 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7080937b4..69de475f3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -660,7 +660,7 @@ SET(SRCS
resources/imagewriter.h
resources/db/itemdb.cpp
resources/db/itemdb.h
- resources/db/itemdbstat.h
+ resources/itemdbstat.h
resources/db/itemfielddb.cpp
resources/db/itemfielddb.h
resources/iteminfo.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 18975b618..d95601ad1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1228,7 +1228,7 @@ manaplus_SOURCES += main.cpp \
resources/db/horsedb.h \
resources/db/itemdb.cpp \
resources/db/itemdb.h \
- resources/db/itemdbstat.h \
+ resources/itemdbstat.h \
resources/db/itemfielddb.cpp \
resources/db/itemfielddb.h \
resources/db/mapdb.cpp \
diff --git a/src/resources/db/itemdb.cpp b/src/resources/db/itemdb.cpp
index 323412e08..b35290639 100644
--- a/src/resources/db/itemdb.cpp
+++ b/src/resources/db/itemdb.cpp
@@ -28,6 +28,7 @@
#include "enums/resources/spritedirection.h"
+#include "resources/itemdbstat.h"
#include "resources/iteminfo.h"
#include "resources/itemtypemapdata.h"
@@ -35,7 +36,6 @@
#include "resources/sprite/spritereference.h"
-#include "resources/db/itemdbstat.h"
#include "resources/db/itemfielddb.h"
#include "resources/db/statdb.h"
diff --git a/src/resources/db/statdb.h b/src/resources/db/statdb.h
index 247c50ddb..475de6095 100644
--- a/src/resources/db/statdb.h
+++ b/src/resources/db/statdb.h
@@ -23,7 +23,7 @@
#include "enums/simpletypes/skiperror.h"
-#include "resources/db/itemdbstat.h"
+#include "resources/itemdbstat.h"
#include <string>
#include <vector>
diff --git a/src/resources/db/itemdbstat.h b/src/resources/itemdbstat.h
index 94e12f987..94e12f987 100644
--- a/src/resources/db/itemdbstat.h
+++ b/src/resources/itemdbstat.h