diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-06-29 14:12:56 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-06-29 14:14:16 +0300 |
| commit | 79ce2bbf16855460051a183c4740e94706b7a07b (patch) | |
| tree | 98d4ce482160d17d5529f392ae8d3eb9f8cb1eb2 /src/resources/map | |
| parent | 436088e97ae3ee8bcfd0530139579fc62271bbc5 (diff) | |
| download | manaverse-79ce2bbf16855460051a183c4740e94706b7a07b.tar.gz manaverse-79ce2bbf16855460051a183c4740e94706b7a07b.tar.bz2 manaverse-79ce2bbf16855460051a183c4740e94706b7a07b.tar.xz manaverse-79ce2bbf16855460051a183c4740e94706b7a07b.zip | |
Move blockmask.h into enums directory.
Diffstat (limited to 'src/resources/map')
| -rw-r--r-- | src/resources/map/blockmask.h | 40 | ||||
| -rw-r--r-- | src/resources/map/map.h | 2 |
2 files changed, 1 insertions, 41 deletions
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" |