From f5660b872aaf0f3c817e74079ec8d506d4eca05c Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 29 Jun 2015 14:18:06 +0300 Subject: Move blocktype.h into enums directory. --- src/CMakeLists.txt | 2 +- src/Makefile.am | 2 +- src/being/actorsprite.h | 3 ++- src/enums/resources/map/blocktype.h | 42 +++++++++++++++++++++++++++++++++++++ src/resources/beinginfo.h | 4 ++-- src/resources/map/blocktype.h | 42 ------------------------------------- src/resources/map/map.h | 2 +- 7 files changed, 49 insertions(+), 48 deletions(-) create mode 100644 src/enums/resources/map/blocktype.h delete mode 100644 src/resources/map/blocktype.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ca774fd11..b14c381de 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -941,7 +941,7 @@ SET(SRCS main.cpp main.h enums/resources/map/blockmask.h - resources/map/blocktype.h + enums/resources/map/blocktype.h resources/map/location.h resources/map/map.cpp resources/map/map.h diff --git a/src/Makefile.am b/src/Makefile.am index 3d7835bd0..8c587b3d5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1080,7 +1080,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ main.cpp \ main.h \ enums/resources/map/blockmask.h \ - resources/map/blocktype.h \ + enums/resources/map/blocktype.h \ resources/map/location.h \ resources/map/map.cpp \ resources/map/map.h \ diff --git a/src/being/actorsprite.h b/src/being/actorsprite.h index f6119bbef..a1f0993b6 100644 --- a/src/being/actorsprite.h +++ b/src/being/actorsprite.h @@ -22,7 +22,6 @@ #ifndef BEING_ACTORSPRITE_H #define BEING_ACTORSPRITE_H -#include "resources/map/blocktype.h" #include "resources/map/mapconsts.h" #include "being/actor.h" @@ -36,6 +35,8 @@ #include "enums/simpletypes/enable.h" #include "enums/simpletypes/forcedisplay.h" +#include "enums/resources/map/blocktype.h" + #include "particle/particlelist.h" #include "particle/particlevector.h" diff --git a/src/enums/resources/map/blocktype.h b/src/enums/resources/map/blocktype.h new file mode 100644 index 000000000..03d14ec37 --- /dev/null +++ b/src/enums/resources/map/blocktype.h @@ -0,0 +1,42 @@ +/* + * 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_BLOCKTYPE_H +#define ENUMS_RESOURCES_MAP_BLOCKTYPE_H + +namespace BlockType +{ + enum BlockType + { + NONE = -1, + WALL, + CHARACTER, + MONSTER, + AIR, + WATER, + GROUND, + GROUNDTOP, + NB_BLOCKTYPES + }; +} + +#endif // ENUMS_RESOURCES_MAP_BLOCKTYPE_H 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 . - */ - -#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" -- cgit v1.2.3-70-g09d2