diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/being/actorsprite.h | 3 | ||||
| -rw-r--r-- | src/enums/resources/map/blocktype.h (renamed from src/resources/map/blocktype.h) | 6 | ||||
| -rw-r--r-- | src/resources/beinginfo.h | 4 | ||||
| -rw-r--r-- | src/resources/map/map.h | 2 |
6 files changed, 10 insertions, 9 deletions
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/resources/map/blocktype.h b/src/enums/resources/map/blocktype.h index 698f6b46a..03d14ec37 100644 --- a/src/resources/map/blocktype.h +++ b/src/enums/resources/map/blocktype.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef RESOURCES_MAP_BLOCKTYPE_H -#define RESOURCES_MAP_BLOCKTYPE_H +#ifndef ENUMS_RESOURCES_MAP_BLOCKTYPE_H +#define ENUMS_RESOURCES_MAP_BLOCKTYPE_H namespace BlockType { @@ -39,4 +39,4 @@ namespace BlockType }; } -#endif // RESOURCES_MAP_BLOCKTYPE_H +#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/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" |