Move blockmask.h into enums directory.

6 files changed, 9 insertions, 49 deletions

diff --git a/src/resources/beinginfo.cpp b/src/resources/beinginfo.cpp
index 28f421a2e..f63e65134 100644
--- a/src/resources/beinginfo.cpp
+++ b/src/resources/beinginfo.cpp
@@ -25,14 +25,14 @@
 #include "configuration.h"
 #include "logger.h"
 
+#include "enums/resources/map/blockmask.h"
+
 #include "resources/attack.h"
 #include "resources/spriteaction.h"
 #include "resources/spritereference.h"
 
 #include "resources/db/colordb.h"
 
-#include "resources/map/blockmask.h"
-
 #include "utils/delete2.h"
 #include "utils/dtor.h"
 #include "utils/gettext.h"
diff --git a/src/resources/db/homunculusdb.cpp b/src/resources/db/homunculusdb.cpp
index 697b74431..4526228e4 100644
--- a/src/resources/db/homunculusdb.cpp
+++ b/src/resources/db/homunculusdb.cpp
@@ -24,11 +24,11 @@
 
 #include "logger.h"
 
+#include "enums/resources/map/blockmask.h"
+
 #include "resources/beingcommon.h"
 #include "resources/beinginfo.h"
 
-#include "resources/map/blockmask.h"
-
 #include "utils/dtor.h"
 
 #include "configuration.h"
diff --git a/src/resources/db/mercenarydb.cpp b/src/resources/db/mercenarydb.cpp
index a6950e9fb..cdd4c71e1 100644
--- a/src/resources/db/mercenarydb.cpp
+++ b/src/resources/db/mercenarydb.cpp
@@ -24,11 +24,11 @@
 
 #include "logger.h"
 
+#include "enums/resources/map/blockmask.h"
+
 #include "resources/beingcommon.h"
 #include "resources/beinginfo.h"
 
-#include "resources/map/blockmask.h"
-
 #include "utils/dtor.h"
 
 #include "configuration.h"
diff --git a/src/resources/db/monsterdb.cpp b/src/resources/db/monsterdb.cpp
index 2e2256b58..a7eda3681 100644
--- a/src/resources/db/monsterdb.cpp
+++ b/src/resources/db/monsterdb.cpp
@@ -24,11 +24,11 @@
 
 #include "logger.h"
 
+#include "enums/resources/map/blockmask.h"
+
 #include "resources/beingcommon.h"
 #include "resources/beinginfo.h"
 
-#include "resources/map/blockmask.h"
-
 #include "utils/dtor.h"
 #include "utils/gettext.h"
 
diff --git a/src/resources/map/blockmask.h b/src/resources/map/blockmask.h
deleted file mode 100644
index cec060255..000000000
--- a/src/resources/map/blockmask.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_BLOCKMASK_H
-#define RESOURCES_MAP_BLOCKMASK_H
-
-namespace BlockMask
-{
-    enum BlockMask
-    {
-        WALL      = 0x80,  // 1000 0000
-        CHARACTER = 0x01,  // 0000 0001
-        MONSTER   = 0x02,  // 0000 0010
-        AIR       = 0x04,  // 0000 0100
-        WATER     = 0x08,  // 0000 1000
-        GROUND    = 0x10,  // 0001 0000
-        GROUNDTOP = 0x20   // 0010 0000
-    };
-}
-
-#endif  // RESOURCES_MAP_BLOCKMASK_H
diff --git a/src/resources/map/map.h b/src/resources/map/map.h
index 4553f5aa8..86dc78e2d 100644
--- a/src/resources/map/map.h
+++ b/src/resources/map/map.h
@@ -29,9 +29,9 @@
 
 #include "enums/render/rendertype.h"
 
+#include "enums/resources/map/blockmask.h"
 #include "enums/resources/map/maptype.h"
 
-#include "resources/map/blockmask.h"
 #include "resources/map/blocktype.h"
 #include "resources/map/properties.h"