summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-05-31 01:39:11 +0300
committerAndrei Karas <akaras@inbox.ru>2015-05-31 01:39:11 +0300
commit88ed8b935542a1e2590bdd79403ff4ee5c7f2a79 (patch)
treed6e5a95683d774fe564abed4990528a2de3568be /src/resources
parenta5766506d6e75ab1d2a4f06b77fddf6fdd65c64e (diff)
downloadplus-88ed8b935542a1e2590bdd79403ff4ee5c7f2a79.tar.gz
plus-88ed8b935542a1e2590bdd79403ff4ee5c7f2a79.tar.bz2
plus-88ed8b935542a1e2590bdd79403ff4ee5c7f2a79.tar.xz
plus-88ed8b935542a1e2590bdd79403ff4ee5c7f2a79.zip
Move maptype enum into enums directory.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/map/map.h3
-rw-r--r--src/resources/map/maplayer.h2
-rw-r--r--src/resources/map/maptype.h40
3 files changed, 3 insertions, 42 deletions
diff --git a/src/resources/map/map.h b/src/resources/map/map.h
index a051961a3..2cba3de6f 100644
--- a/src/resources/map/map.h
+++ b/src/resources/map/map.h
@@ -29,9 +29,10 @@
#include "enums/render/rendertype.h"
+#include "enums/resources/map/maptype.h"
+
#include "resources/map/blockmask.h"
#include "resources/map/blocktype.h"
-#include "resources/map/maptype.h"
#include "resources/map/properties.h"
#include "listeners/configlistener.h"
diff --git a/src/resources/map/maplayer.h b/src/resources/map/maplayer.h
index 25773ebb2..9b2617d32 100644
--- a/src/resources/map/maplayer.h
+++ b/src/resources/map/maplayer.h
@@ -27,7 +27,7 @@
#include "being/actor.h"
-#include "resources/map/maptype.h"
+#include "enums/resources/map/maptype.h"
#include <vector>
diff --git a/src/resources/map/maptype.h b/src/resources/map/maptype.h
deleted file mode 100644
index 27a58bccf..000000000
--- a/src/resources/map/maptype.h
+++ /dev/null
@@ -1,40 +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_MAPTYPE_H
-#define RESOURCES_MAP_MAPTYPE_H
-
-namespace MapType
-{
- enum MapType
- {
- NORMAL = 0,
- DEBUG = 1,
- SPECIAL = 2,
- SPECIAL2 = 3,
- SPECIAL3 = 4,
- SPECIAL4 = 5,
- BLACKWHITE = 6
- };
-} // namespace MapType
-
-#endif // RESOURCES_MAP_MAPTYPE_H