summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-09-30 20:36:56 +0300
committerAndrei Karas <akaras@inbox.ru>2013-09-30 20:36:56 +0300
commitf513868a135c1af288ff13ba2fcfdd6a5dc70a19 (patch)
treea979327e71dae600561f6402f18552561665ab10 /src/resources
parent076b11c903f88592fbd74f3af3989e71362912f8 (diff)
downloadmv-f513868a135c1af288ff13ba2fcfdd6a5dc70a19.tar.gz
mv-f513868a135c1af288ff13ba2fcfdd6a5dc70a19.tar.bz2
mv-f513868a135c1af288ff13ba2fcfdd6a5dc70a19.tar.xz
mv-f513868a135c1af288ff13ba2fcfdd6a5dc70a19.zip
move db files into db directory.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/beinginfo.h3
-rw-r--r--src/resources/db/avatardb.cpp (renamed from src/resources/avatardb.cpp)2
-rw-r--r--src/resources/db/avatardb.h (renamed from src/resources/avatardb.h)0
-rw-r--r--src/resources/db/chardb.cpp (renamed from src/resources/chardb.cpp)2
-rw-r--r--src/resources/db/chardb.h (renamed from src/resources/chardb.h)0
-rw-r--r--src/resources/db/colordb.cpp (renamed from src/resources/colordb.cpp)2
-rw-r--r--src/resources/db/colordb.h (renamed from src/resources/colordb.h)0
-rw-r--r--src/resources/db/deaddb.cpp (renamed from src/resources/deaddb.cpp)2
-rw-r--r--src/resources/db/deaddb.h (renamed from src/resources/deaddb.h)0
-rw-r--r--src/resources/db/emotedb.cpp (renamed from src/resources/emotedb.cpp)2
-rw-r--r--src/resources/db/emotedb.h (renamed from src/resources/emotedb.h)0
-rw-r--r--src/resources/db/itemdb.cpp (renamed from src/resources/itemdb.cpp)2
-rw-r--r--src/resources/db/itemdb.h (renamed from src/resources/itemdb.h)0
-rw-r--r--src/resources/db/mapdb.cpp (renamed from src/resources/mapdb.cpp)2
-rw-r--r--src/resources/db/mapdb.h (renamed from src/resources/mapdb.h)0
-rw-r--r--src/resources/db/monsterdb.cpp (renamed from src/resources/monsterdb.cpp)2
-rw-r--r--src/resources/db/monsterdb.h (renamed from src/resources/monsterdb.h)0
-rw-r--r--src/resources/db/npcdb.cpp (renamed from src/resources/npcdb.cpp)2
-rw-r--r--src/resources/db/npcdb.h (renamed from src/resources/npcdb.h)0
-rw-r--r--src/resources/db/palettedb.cpp (renamed from src/resources/palettedb.cpp)2
-rw-r--r--src/resources/db/palettedb.h (renamed from src/resources/palettedb.h)0
-rw-r--r--src/resources/db/petdb.cpp (renamed from src/resources/petdb.cpp)2
-rw-r--r--src/resources/db/petdb.h (renamed from src/resources/petdb.h)0
-rw-r--r--src/resources/db/sounddb.cpp (renamed from src/resources/sounddb.cpp)2
-rw-r--r--src/resources/db/sounddb.h (renamed from src/resources/sounddb.h)0
-rw-r--r--src/resources/dye.cpp2
-rw-r--r--src/resources/iteminfo.cpp2
-rw-r--r--src/resources/iteminfo.h2
-rw-r--r--src/resources/mapreader.cpp3
29 files changed, 19 insertions, 17 deletions
diff --git a/src/resources/beinginfo.h b/src/resources/beinginfo.h
index d465dfa64..3d00471da 100644
--- a/src/resources/beinginfo.h
+++ b/src/resources/beinginfo.h
@@ -25,10 +25,11 @@
#include "being/actorsprite.h"
-#include "resources/colordb.h"
#include "resources/cursor.h"
#include "resources/soundinfo.h"
+#include "resources/db/colordb.h"
+
#include <map>
struct Attack final
diff --git a/src/resources/avatardb.cpp b/src/resources/db/avatardb.cpp
index 2275f3576..516234928 100644
--- a/src/resources/avatardb.cpp
+++ b/src/resources/db/avatardb.cpp
@@ -20,7 +20,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "resources/avatardb.h"
+#include "resources/db/avatardb.h"
#include "logger.h"
diff --git a/src/resources/avatardb.h b/src/resources/db/avatardb.h
index e5af78ff7..e5af78ff7 100644
--- a/src/resources/avatardb.h
+++ b/src/resources/db/avatardb.h
diff --git a/src/resources/chardb.cpp b/src/resources/db/chardb.cpp
index 280ed6787..1c2e0ec82 100644
--- a/src/resources/chardb.cpp
+++ b/src/resources/db/chardb.cpp
@@ -19,7 +19,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "resources/chardb.h"
+#include "resources/db/chardb.h"
#include "configuration.h"
#include "logger.h"
diff --git a/src/resources/chardb.h b/src/resources/db/chardb.h
index 3072d41ff..3072d41ff 100644
--- a/src/resources/chardb.h
+++ b/src/resources/db/chardb.h
diff --git a/src/resources/colordb.cpp b/src/resources/db/colordb.cpp
index d947a6523..0e81ff1c0 100644
--- a/src/resources/colordb.cpp
+++ b/src/resources/db/colordb.cpp
@@ -19,7 +19,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "resources/colordb.h"
+#include "resources/db/colordb.h"
#include "client.h"
#include "configuration.h"
diff --git a/src/resources/colordb.h b/src/resources/db/colordb.h
index 3eec3625d..3eec3625d 100644
--- a/src/resources/colordb.h
+++ b/src/resources/db/colordb.h
diff --git a/src/resources/deaddb.cpp b/src/resources/db/deaddb.cpp
index abfb511ff..fa418ee3e 100644
--- a/src/resources/deaddb.cpp
+++ b/src/resources/db/deaddb.cpp
@@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "resources/deaddb.h"
+#include "resources/db/deaddb.h"
#include "configuration.h"
#include "logger.h"
diff --git a/src/resources/deaddb.h b/src/resources/db/deaddb.h
index a0f6c7b9b..a0f6c7b9b 100644
--- a/src/resources/deaddb.h
+++ b/src/resources/db/deaddb.h
diff --git a/src/resources/emotedb.cpp b/src/resources/db/emotedb.cpp
index 9a0c086bc..21a3aa0c6 100644
--- a/src/resources/emotedb.cpp
+++ b/src/resources/db/emotedb.cpp
@@ -19,7 +19,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "resources/emotedb.h"
+#include "resources/db/emotedb.h"
#include "animatedsprite.h"
#include "client.h"
diff --git a/src/resources/emotedb.h b/src/resources/db/emotedb.h
index b0b232653..b0b232653 100644
--- a/src/resources/emotedb.h
+++ b/src/resources/db/emotedb.h
diff --git a/src/resources/itemdb.cpp b/src/resources/db/itemdb.cpp
index 513ec6488..eeae4cfec 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/db/itemdb.cpp
@@ -20,7 +20,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "resources/itemdb.h"
+#include "resources/db/itemdb.h"
#include "client.h"
#include "configuration.h"
diff --git a/src/resources/itemdb.h b/src/resources/db/itemdb.h
index 1a5a4cce8..1a5a4cce8 100644
--- a/src/resources/itemdb.h
+++ b/src/resources/db/itemdb.h
diff --git a/src/resources/mapdb.cpp b/src/resources/db/mapdb.cpp
index 61ebe6d17..13aac3032 100644
--- a/src/resources/mapdb.cpp
+++ b/src/resources/db/mapdb.cpp
@@ -19,7 +19,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "resources/mapdb.h"
+#include "resources/db/mapdb.h"
#include "configuration.h"
#include "logger.h"
diff --git a/src/resources/mapdb.h b/src/resources/db/mapdb.h
index 9e0407f66..9e0407f66 100644
--- a/src/resources/mapdb.h
+++ b/src/resources/db/mapdb.h
diff --git a/src/resources/monsterdb.cpp b/src/resources/db/monsterdb.cpp
index e900c426f..502c9cc2c 100644
--- a/src/resources/monsterdb.cpp
+++ b/src/resources/db/monsterdb.cpp
@@ -20,7 +20,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "resources/monsterdb.h"
+#include "resources/db/monsterdb.h"
#include "logger.h"
diff --git a/src/resources/monsterdb.h b/src/resources/db/monsterdb.h
index 426228388..426228388 100644
--- a/src/resources/monsterdb.h
+++ b/src/resources/db/monsterdb.h
diff --git a/src/resources/npcdb.cpp b/src/resources/db/npcdb.cpp
index f9d9295d6..922b2e8ee 100644
--- a/src/resources/npcdb.cpp
+++ b/src/resources/db/npcdb.cpp
@@ -20,7 +20,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "resources/npcdb.h"
+#include "resources/db/npcdb.h"
#include "logger.h"
diff --git a/src/resources/npcdb.h b/src/resources/db/npcdb.h
index 9614c2052..9614c2052 100644
--- a/src/resources/npcdb.h
+++ b/src/resources/db/npcdb.h
diff --git a/src/resources/palettedb.cpp b/src/resources/db/palettedb.cpp
index 1219601ce..91c3b1e34 100644
--- a/src/resources/palettedb.cpp
+++ b/src/resources/db/palettedb.cpp
@@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "resources/palettedb.h"
+#include "resources/db/palettedb.h"
#include "logger.h"
diff --git a/src/resources/palettedb.h b/src/resources/db/palettedb.h
index 307178693..307178693 100644
--- a/src/resources/palettedb.h
+++ b/src/resources/db/palettedb.h
diff --git a/src/resources/petdb.cpp b/src/resources/db/petdb.cpp
index a85480e7b..169c8ee39 100644
--- a/src/resources/petdb.cpp
+++ b/src/resources/db/petdb.cpp
@@ -20,7 +20,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "resources/petdb.h"
+#include "resources/db/petdb.h"
#include "logger.h"
diff --git a/src/resources/petdb.h b/src/resources/db/petdb.h
index d5e4b5613..d5e4b5613 100644
--- a/src/resources/petdb.h
+++ b/src/resources/db/petdb.h
diff --git a/src/resources/sounddb.cpp b/src/resources/db/sounddb.cpp
index 7b0d078e1..f1e0ff93c 100644
--- a/src/resources/sounddb.cpp
+++ b/src/resources/db/sounddb.cpp
@@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "resources/sounddb.h"
+#include "resources/db/sounddb.h"
#include "configuration.h"
#include "notifications.h"
diff --git a/src/resources/sounddb.h b/src/resources/db/sounddb.h
index 356cd4e13..356cd4e13 100644
--- a/src/resources/sounddb.h
+++ b/src/resources/db/sounddb.h
diff --git a/src/resources/dye.cpp b/src/resources/dye.cpp
index 7889d24aa..873c2a8fe 100644
--- a/src/resources/dye.cpp
+++ b/src/resources/dye.cpp
@@ -24,7 +24,7 @@
#include "logger.h"
-#include "resources/palettedb.h"
+#include "resources/db/palettedb.h"
#include <math.h>
#include <sstream>
diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp
index dd86e3196..eb8014f3e 100644
--- a/src/resources/iteminfo.cpp
+++ b/src/resources/iteminfo.cpp
@@ -22,7 +22,7 @@
#include "resources/iteminfo.h"
-#include "resources/itemdb.h"
+#include "resources/db/itemdb.h"
#include "configuration.h"
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index 71a6119af..b386e51f7 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.h
@@ -25,7 +25,7 @@
#include "being/being.h"
-#include "resources/colordb.h"
+#include "resources/db/colordb.h"
#include <map>
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index 5b21acb02..4097acb89 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -31,9 +31,10 @@
#include "resources/animation.h"
#include "resources/image.h"
-#include "resources/mapdb.h"
#include "resources/resourcemanager.h"
+#include "resources/db/mapdb.h"
+
#include "utils/base64.h"
#include <iostream>