diff options
Diffstat (limited to 'src/resources/map')
| -rw-r--r-- | src/resources/map/blocktype.h | 42 | ||||
| -rw-r--r-- | src/resources/map/map.h | 2 |
2 files changed, 1 insertions, 43 deletions
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" |