Move blocktype.h into enums directory.

3 files changed, 3 insertions, 45 deletions

diff --git a/src/resources/beinginfo.h b/src/resources/beinginfo.h
index 1d2a3546c..0a6330470 100644
--- a/src/resources/beinginfo.h
+++ b/src/resources/beinginfo.h
@@ -25,6 +25,8 @@
 
 #include "enums/being/targetcursorsize.h"
 
+#include "enums/resources/map/blocktype.h"
+
 #include "enums/simpletypes/beingtypeid.h"
 
 #include "resources/beingmenuitem.h"
@@ -32,8 +34,6 @@
 #include "resources/soundinfo.h"
 #include "resources/spritedisplay.h"
 
-#include "resources/map/blocktype.h"
-
 struct Attack;
 
 namespace ColorDB
diff --git a/src/resources/map/blocktype.h b/src/resources/map/blocktype.h
deleted file mode 100644
index 698f6b46a..000000000
--- a/src/resources/map/blocktype.h
+++ /dev/null
@@ -1,42 +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_BLOCKTYPE_H
-#define RESOURCES_MAP_BLOCKTYPE_H
-
-namespace BlockType
-{
-    enum BlockType
-    {
-        NONE = -1,
-        WALL,
-        CHARACTER,
-        MONSTER,
-        AIR,
-        WATER,
-        GROUND,
-        GROUNDTOP,
-        NB_BLOCKTYPES
-    };
-}
-
-#endif  // RESOURCES_MAP_BLOCKTYPE_H
diff --git a/src/resources/map/map.h b/src/resources/map/map.h
index 86dc78e2d..30ec2d240 100644
--- a/src/resources/map/map.h
+++ b/src/resources/map/map.h
@@ -30,9 +30,9 @@
 #include "enums/render/rendertype.h"
 
 #include "enums/resources/map/blockmask.h"
+#include "enums/resources/map/blocktype.h"
 #include "enums/resources/map/maptype.h"
 
-#include "resources/map/blocktype.h"
 #include "resources/map/properties.h"
 
 #include "listeners/configlistener.h"