diff options
| -rw-r--r-- | src/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/resources/map/location.h | 2 | ||||
| -rw-r--r-- | src/resources/map/map.h | 27 | ||||
| -rw-r--r-- | src/resources/map/metatile.h | 53 |
5 files changed, 57 insertions, 27 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 477e89e81..869ac3a98 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -711,6 +711,7 @@ SET(SRCS resources/map/mapheights.h resources/map/maplayer.cpp resources/map/maplayer.h + resources/map/metatile.h render/mgl.cpp render/mgl.h render/mobileopenglgraphics.cpp diff --git a/src/Makefile.am b/src/Makefile.am index deb4560f3..f0c6b30c5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -800,6 +800,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ resources/map/mapheights.h \ resources/map/maplayer.cpp \ resources/map/maplayer.h \ + resources/map/metatile.h \ render/mgl.cpp \ render/mgl.h \ render/mobileopenglgraphics.cpp \ diff --git a/src/resources/map/location.h b/src/resources/map/location.h index 86726c485..6718f5c24 100644 --- a/src/resources/map/location.h +++ b/src/resources/map/location.h @@ -23,7 +23,7 @@ #ifndef RESOURCES_MAP_LOCATION #define RESOURCES_MAP_LOCATION -#include "resources/map/map.h" +#include "resources/map/metatile.h" #include "localconsts.h" diff --git a/src/resources/map/map.h b/src/resources/map/map.h index f0712be76..1c1c41b5c 100644 --- a/src/resources/map/map.h +++ b/src/resources/map/map.h @@ -27,6 +27,7 @@ #include "being/actor.h" +#include "resources/map/metatile.h" #include "resources/map/properties.h" #include "listeners/configlistener.h" @@ -64,32 +65,6 @@ typedef AmbientLayerVector::iterator AmbientLayerVectorIter; static const int mapTileSize = 32; /** - * A meta tile stores additional information about a location on a tile map. - * This is information that doesn't need to be repeated for each tile in each - * layer of the map. - */ -struct MetaTile final -{ - /** - * Constructor. - */ - MetaTile() : Fcost(0), Gcost(0), Hcost(0), whichList(0), - parentX(0), parentY(0), blockmask(0) - {} - - A_DELETE_COPY(MetaTile) - - // Pathfinding members - int Fcost; /**< Estimation of total path cost */ - int Gcost; /**< Cost from start to this location */ - int Hcost; /**< Estimated cost to goal */ - unsigned whichList; /**< No list, open list or closed list */ - int parentX; /**< X coordinate of parent tile */ - int parentY; /**< Y coordinate of parent tile */ - unsigned char blockmask; /**< Blocking properties of this tile */ -}; - -/** * Animation cycle of a tile image which changes the map accordingly. */ class TileAnimation final diff --git a/src/resources/map/metatile.h b/src/resources/map/metatile.h new file mode 100644 index 000000000..f29b5a9b7 --- /dev/null +++ b/src/resources/map/metatile.h @@ -0,0 +1,53 @@ +/* + * The ManaPlus Client + * Copyright (C) 2004-2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2014 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_METATILE_H +#define RESOURCES_MAP_METATILE_H + +#include "localconsts.h" + +/** + * A meta tile stores additional information about a location on a tile map. + * This is information that doesn't need to be repeated for each tile in each + * layer of the map. + */ +struct MetaTile final +{ + /** + * Constructor. + */ + MetaTile() : Fcost(0), Gcost(0), Hcost(0), whichList(0), + parentX(0), parentY(0), blockmask(0) + {} + + A_DELETE_COPY(MetaTile) + + // Pathfinding members + int Fcost; /**< Estimation of total path cost */ + int Gcost; /**< Cost from start to this location */ + int Hcost; /**< Estimated cost to goal */ + unsigned whichList; /**< No list, open list or closed list */ + int parentX; /**< X coordinate of parent tile */ + int parentY; /**< Y coordinate of parent tile */ + unsigned char blockmask; /**< Blocking properties of this tile */ +}; +#endif // RESOURCES_MAP_METATILE_H |