summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-12-14 20:13:31 +0300
committerAndrei Karas <akaras@inbox.ru>2015-12-14 20:13:31 +0300
commit517e8c2753f4bcc7d2788a28d663cd79edec6c59 (patch)
tree985f4e0ac4001f92102bfdb1c372a1cd5d7a889d /src/resources
parent46454b631d5fd78e07bb292328526639539b7ce3 (diff)
downloadplus-517e8c2753f4bcc7d2788a28d663cd79edec6c59.tar.gz
plus-517e8c2753f4bcc7d2788a28d663cd79edec6c59.tar.bz2
plus-517e8c2753f4bcc7d2788a28d663cd79edec6c59.tar.xz
plus-517e8c2753f4bcc7d2788a28d663cd79edec6c59.zip
Move mapconsts.h into const directory.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/db/itemdb.cpp2
-rw-r--r--src/resources/iteminfo.cpp2
-rw-r--r--src/resources/map/mapconsts.h28
-rw-r--r--src/resources/map/speciallayer.cpp3
-rw-r--r--src/resources/mapreader.cpp3
-rw-r--r--src/resources/spritedef.cpp2
6 files changed, 7 insertions, 33 deletions
diff --git a/src/resources/db/itemdb.cpp b/src/resources/db/itemdb.cpp
index 9de6b307e..42c2f645b 100644
--- a/src/resources/db/itemdb.cpp
+++ b/src/resources/db/itemdb.cpp
@@ -22,7 +22,7 @@
#include "resources/db/itemdb.h"
-#include "resources/map/mapconsts.h"
+#include "const/resources/map/map.h"
#include "configuration.h"
#include "logger.h"
diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp
index bd4a0f704..490a185bc 100644
--- a/src/resources/iteminfo.cpp
+++ b/src/resources/iteminfo.cpp
@@ -25,7 +25,7 @@
#include "resources/spriteaction.h"
#include "resources/spritedirection.h"
-#include "resources/map/mapconsts.h"
+#include "const/resources/map/map.h"
#include "resources/db/colordb.h"
#include "resources/db/itemdb.h"
diff --git a/src/resources/map/mapconsts.h b/src/resources/map/mapconsts.h
deleted file mode 100644
index ccf54c3dc..000000000
--- a/src/resources/map/mapconsts.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * The ManaPlus Client
- * Copyright (C) 2004-2009 The Mana World Development Team
- * Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2015 The ManaPlus Developers
- *
- * This file is part of The ManaPlus Client.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef RESOURCES_MAP_MAPCONSTS_H
-#define RESOURCES_MAP_MAPCONSTS_H
-
-static const int mapTileSize = 32;
-
-#endif // RESOURCES_MAP_MAPCONSTS_H
diff --git a/src/resources/map/speciallayer.cpp b/src/resources/map/speciallayer.cpp
index 95ec90e35..faa2ef6f0 100644
--- a/src/resources/map/speciallayer.cpp
+++ b/src/resources/map/speciallayer.cpp
@@ -20,9 +20,10 @@
#include "resources/map/speciallayer.h"
+#include "const/resources/map/map.h"
+
#include "enums/resources/map/mapitemtype.h"
-#include "resources/map/mapconsts.h"
#include "resources/map/mapitem.h"
#include "utils/delete2.h"
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index 4c5776e6d..be4b4cb67 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -28,10 +28,11 @@
#endif
#include "logger.h"
+#include "const/resources/map/map.h"
+
#include "enums/resources/map/mapitemtype.h"
#include "resources/map/map.h"
-#include "resources/map/mapconsts.h"
#include "resources/map/mapheights.h"
#include "resources/map/tileset.h"
diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp
index 8626a9e6e..53b975a9f 100644
--- a/src/resources/spritedef.cpp
+++ b/src/resources/spritedef.cpp
@@ -26,7 +26,7 @@
#include "logger.h"
#include "settings.h"
-#include "resources/map/mapconsts.h"
+#include "const/resources/map/map.h"
#include "resources/action.h"
#include "resources/animation.h"