summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-11-28 16:38:32 +0300
committerAndrei Karas <akaras@inbox.ru>2014-11-28 16:38:51 +0300
commit92725cef35bead1b7e6b934e3861b46393b74797 (patch)
treec2878528d6f6a85d59a3bd676d1cf9e85000f791
parent0f0466b9a273a7f4481acae47f5cb1166a2d145a (diff)
downloadevol-hercules-92725cef35bead1b7e6b934e3861b46393b74797.tar.gz
evol-hercules-92725cef35bead1b7e6b934e3861b46393b74797.tar.bz2
evol-hercules-92725cef35bead1b7e6b934e3861b46393b74797.tar.xz
evol-hercules-92725cef35bead1b7e6b934e3861b46393b74797.zip
Move data files into data directory.
-rw-r--r--src/Makefile.am8
-rw-r--r--src/map/clif.c4
-rw-r--r--src/map/data/mapd.c (renamed from src/map/mapd.c)2
-rw-r--r--src/map/data/mapd.h (renamed from src/map/mapd.h)0
-rw-r--r--src/map/data/session.c (renamed from src/map/session.c)2
-rw-r--r--src/map/data/session.h (renamed from src/map/session.h)0
-rw-r--r--src/map/lang.c2
-rw-r--r--src/map/npc.c2
-rw-r--r--src/map/parse.c2
-rw-r--r--src/map/pc.c2
-rw-r--r--src/map/script.c4
11 files changed, 14 insertions, 14 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index d7966c2..514a0b7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,8 +19,6 @@ MAP_SRC = map/clif.c \
map/init.c \
map/lang.c \
map/lang.h \
- map/mapd.c \
- map/mapd.h \
map/npc.c \
map/npc.h \
map/parse.c \
@@ -34,8 +32,10 @@ MAP_SRC = map/clif.c \
map/scriptdefines.h \
map/send.c \
map/send.h \
- map/session.c \
- map/session.h \
+ map/data/mapd.c \
+ map/data/mapd.h \
+ map/data/session.c \
+ map/data/session.h \
map/struct/mapdext.h \
map/struct/sessionext.h \
map/utils/formatutils.c \
diff --git a/src/map/clif.c b/src/map/clif.c
index 0ea0983..5868c5e 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -17,9 +17,9 @@
#include "map/clif.h"
#include "map/lang.h"
-#include "map/mapd.h"
#include "map/send.h"
-#include "map/session.h"
+#include "map/data/mapd.h"
+#include "map/data/session.h"
#include "map/struct/mapdext.h"
#include "map/struct/sessionext.h"
diff --git a/src/map/mapd.c b/src/map/data/mapd.c
index 7b72d6d..6ce239c 100644
--- a/src/map/mapd.c
+++ b/src/map/data/mapd.c
@@ -12,7 +12,7 @@
#include "../../../common/strlib.h"
#include "../../../map/map.h"
-#include "map/mapd.h"
+#include "map/data/mapd.h"
#include "map/struct/mapdext.h"
struct MapdExt *mapd_get(int m)
diff --git a/src/map/mapd.h b/src/map/data/mapd.h
index a0878ae..a0878ae 100644
--- a/src/map/mapd.h
+++ b/src/map/data/mapd.h
diff --git a/src/map/session.c b/src/map/data/session.c
index 7291772..fd1c0d5 100644
--- a/src/map/session.c
+++ b/src/map/data/session.c
@@ -12,7 +12,7 @@
#include "../../../common/strlib.h"
#include "../../../map/pc.h"
-#include "map/session.h"
+#include "map/data/session.h"
#include "map/struct/sessionext.h"
struct SessionExt *session_get(int fd)
diff --git a/src/map/session.h b/src/map/data/session.h
index 40b05e6..40b05e6 100644
--- a/src/map/session.h
+++ b/src/map/data/session.h
diff --git a/src/map/lang.c b/src/map/lang.c
index 66cdb0d..6264cef 100644
--- a/src/map/lang.c
+++ b/src/map/lang.c
@@ -14,7 +14,7 @@
#include "../../../map/pc.h"
#include "map/lang.h"
-#include "map/session.h"
+#include "map/data/session.h"
#include "map/struct/sessionext.h"
#define MAX_LANGS 100
diff --git a/src/map/npc.c b/src/map/npc.c
index f5a07ea..7478f0f 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -14,7 +14,7 @@
#include "../../../map/npc.h"
#include "../../../map/pc.h"
-#include "map/mapd.h"
+#include "map/data/mapd.h"
#include "map/struct/mapdext.h"
#include "map/npc.h"
diff --git a/src/map/parse.c b/src/map/parse.c
index 954e45c..0d09163 100644
--- a/src/map/parse.c
+++ b/src/map/parse.c
@@ -12,7 +12,7 @@
#include "../../../common/strlib.h"
#include "map/parse.h"
-#include "map/session.h"
+#include "map/data/session.h"
#include "map/struct/sessionext.h"
void map_parse_version(int fd)
diff --git a/src/map/pc.c b/src/map/pc.c
index 5e82c19..524c130 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -14,7 +14,7 @@
#include "../../../map/pc.h"
#include "map/pc.h"
-#include "map/session.h"
+#include "map/data/session.h"
#include "map/struct/sessionext.h"
int langScriptId;
diff --git a/src/map/script.c b/src/map/script.c
index f387714..e762583 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -20,10 +20,10 @@
#include "map/script.h"
#include "map/clif.h"
#include "map/lang.h"
-#include "map/mapd.h"
#include "map/scriptdefines.h"
#include "map/send.h"
-#include "map/session.h"
+#include "map/data/mapd.h"
+#include "map/data/session.h"
#include "map/struct/mapdext.h"
#include "map/struct/sessionext.h"
#include "map/utils/formatutils.h"