summaryrefslogtreecommitdiff
path: root/src/being
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-05-11 13:18:07 +0300
committerAndrei Karas <akaras@inbox.ru>2014-05-11 13:26:25 +0300
commitad42810bb9484f4930252ecc34b91d83f37e3293 (patch)
tree69f3bcf9b26bbdb08dde7e3a0fa6648fc432cf12 /src/being
parent116349dac9b9d13d0e57e24e345590a8a0e70210 (diff)
downloadmv-ad42810bb9484f4930252ecc34b91d83f37e3293.tar.gz
mv-ad42810bb9484f4930252ecc34b91d83f37e3293.tar.bz2
mv-ad42810bb9484f4930252ecc34b91d83f37e3293.tar.xz
mv-ad42810bb9484f4930252ecc34b91d83f37e3293.zip
Move map related files into resources/map.
Diffstat (limited to 'src/being')
-rw-r--r--src/being/actor.cpp2
-rw-r--r--src/being/actorsprite.h3
-rw-r--r--src/being/compoundsprite.cpp3
-rw-r--r--src/being/localplayer.cpp5
4 files changed, 8 insertions, 5 deletions
diff --git a/src/being/actor.cpp b/src/being/actor.cpp
index 1416b5481..7ced058d8 100644
--- a/src/being/actor.cpp
+++ b/src/being/actor.cpp
@@ -21,7 +21,7 @@
#include "being/actor.h"
-#include "map.h"
+#include "resources/map/map.h"
#include "debug.h"
diff --git a/src/being/actorsprite.h b/src/being/actorsprite.h
index fd90aba09..ed0d328de 100644
--- a/src/being/actorsprite.h
+++ b/src/being/actorsprite.h
@@ -23,7 +23,8 @@
#define BEING_ACTORSPRITE_H
#include "localconsts.h"
-#include "map.h"
+
+#include "resources/map/map.h"
#include "being/actor.h"
#include "being/compoundsprite.h"
diff --git a/src/being/compoundsprite.cpp b/src/being/compoundsprite.cpp
index 91da283a4..46baaf2c9 100644
--- a/src/being/compoundsprite.cpp
+++ b/src/being/compoundsprite.cpp
@@ -28,9 +28,10 @@
#include "main.h"
#endif
-#include "map.h"
#include "sdlshared.h"
+#include "resources/map/map.h"
+
#include "render/surfacegraphics.h"
#include "resources/image.h"
diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp
index 7a364072c..697a31069 100644
--- a/src/being/localplayer.cpp
+++ b/src/being/localplayer.cpp
@@ -29,12 +29,11 @@
#include "dropshortcut.h"
#include "guild.h"
#include "item.h"
-#include "maplayer.h"
#include "party.h"
#include "soundconsts.h"
#include "soundmanager.h"
#include "statuseffect.h"
-#include "walklayer.h"
+#include "resources/map/walklayer.h"
#include "being/playerinfo.h"
#include "being/playerrelations.h"
@@ -69,6 +68,8 @@
#include "resources/db/emotedb.h"
#include "resources/db/weaponsdb.h"
+#include "resources/map/maplayer.h"
+
#include "listeners/updatestatuslistener.h"
#include "utils/delete2.h"