From 88ed8b935542a1e2590bdd79403ff4ee5c7f2a79 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 31 May 2015 01:39:11 +0300
Subject: Move maptype enum into enums directory.

---
 src/CMakeLists.txt                |  2 +-
 src/Makefile.am                   |  2 +-
 src/enums/resources/map/maptype.h | 40 +++++++++++++++++++++++++++++++++++++++
 src/resources/map/map.h           |  3 ++-
 src/resources/map/maplayer.h      |  2 +-
 src/resources/map/maptype.h       | 40 ---------------------------------------
 src/settings.h                    |  2 +-
 7 files changed, 46 insertions(+), 45 deletions(-)
 create mode 100644 src/enums/resources/map/maptype.h
 delete mode 100644 src/resources/map/maptype.h

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index af5eb8b2b..8723cd3c4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -947,7 +947,7 @@ SET(SRCS
     resources/map/mapobject.h
     resources/map/mapobjectlist.h
     resources/map/maprowvertexes.h
-    resources/map/maptype.h
+    enums/resources/map/maptype.h
     resources/map/metatile.h
     resources/map/objectslayer.cpp
     resources/map/objectslayer.h
diff --git a/src/Makefile.am b/src/Makefile.am
index a3cfe0558..3786cdc52 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1082,7 +1082,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      resources/map/mapobject.h \
 	      resources/map/mapobjectlist.h \
 	      resources/map/maprowvertexes.h \
-	      resources/map/maptype.h \
+	      enums/resources/map/maptype.h \
 	      resources/map/metatile.h \
 	      resources/map/objectslayer.cpp \
 	      resources/map/objectslayer.h \
diff --git a/src/enums/resources/map/maptype.h b/src/enums/resources/map/maptype.h
new file mode 100644
index 000000000..27a58bccf
--- /dev/null
+++ b/src/enums/resources/map/maptype.h
@@ -0,0 +1,40 @@
+/*
+ *  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
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
diff --git a/src/settings.h b/src/settings.h
index f1c087038..068bfc573 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -23,7 +23,7 @@
 
 #include "options.h"
 
-#include "resources/map/maptype.h"
+#include "enums/resources/map/maptype.h"
 
 #include <vector>
 
-- 
cgit v1.2.3-70-g09d2