From 79ce2bbf16855460051a183c4740e94706b7a07b Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 29 Jun 2015 14:12:56 +0300 Subject: Move blockmask.h into enums directory. --- src/CMakeLists.txt | 2 +- src/Makefile.am | 2 +- src/enums/resources/map/blockmask.h | 40 +++++++++++++++++++++++++++++++++++++ src/resources/beinginfo.cpp | 4 ++-- src/resources/db/homunculusdb.cpp | 4 ++-- src/resources/db/mercenarydb.cpp | 4 ++-- src/resources/db/monsterdb.cpp | 4 ++-- src/resources/map/blockmask.h | 40 ------------------------------------- src/resources/map/map.h | 2 +- 9 files changed, 51 insertions(+), 51 deletions(-) create mode 100644 src/enums/resources/map/blockmask.h delete mode 100644 src/resources/map/blockmask.h (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4535fa97a..ca774fd11 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -940,7 +940,7 @@ SET(SRCS logger.h main.cpp main.h - resources/map/blockmask.h + enums/resources/map/blockmask.h resources/map/blocktype.h resources/map/location.h resources/map/map.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 094d25a33..3d7835bd0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1079,7 +1079,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ logger.h \ main.cpp \ main.h \ - resources/map/blockmask.h \ + enums/resources/map/blockmask.h \ resources/map/blocktype.h \ resources/map/location.h \ resources/map/map.cpp \ diff --git a/src/enums/resources/map/blockmask.h b/src/enums/resources/map/blockmask.h new file mode 100644 index 000000000..83a6ffedb --- /dev/null +++ b/src/enums/resources/map/blockmask.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 . + */ + +#ifndef ENUMS_RESOURCES_MAP_BLOCKMASK_H +#define ENUMS_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 // ENUMS_RESOURCES_MAP_BLOCKMASK_H 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 . - */ - -#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" -- cgit v1.2.3-70-g09d2