diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-05-11 16:16:29 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-05-11 16:16:29 +0300 |
commit | 835dd846af75ea2cfc91f0134156f9c6545dd8ce (patch) | |
tree | 0629a5d7723d500ffcf3c895a1af4cd2b993d93a /src/resources/map | |
parent | 20310ca4fa87856a2ac487ce70835384759b979b (diff) | |
download | mv-835dd846af75ea2cfc91f0134156f9c6545dd8ce.tar.gz mv-835dd846af75ea2cfc91f0134156f9c6545dd8ce.tar.bz2 mv-835dd846af75ea2cfc91f0134156f9c6545dd8ce.tar.xz mv-835dd846af75ea2cfc91f0134156f9c6545dd8ce.zip |
Move map consts into separate file.
Diffstat (limited to 'src/resources/map')
-rw-r--r-- | src/resources/map/map.h | 2 | ||||
-rw-r--r-- | src/resources/map/mapconsts.h | 28 | ||||
-rw-r--r-- | src/resources/map/speciallayer.cpp | 2 |
3 files changed, 29 insertions, 3 deletions
diff --git a/src/resources/map/map.h b/src/resources/map/map.h index 8c7939149..dac1778c3 100644 --- a/src/resources/map/map.h +++ b/src/resources/map/map.h @@ -60,8 +60,6 @@ typedef std::vector<AmbientLayer*> AmbientLayerVector; typedef AmbientLayerVector::const_iterator AmbientLayerVectorCIter; typedef AmbientLayerVector::iterator AmbientLayerVectorIter; -static const int mapTileSize = 32; - /** * A tile map. */ diff --git a/src/resources/map/mapconsts.h b/src/resources/map/mapconsts.h new file mode 100644 index 000000000..25bc9c4a9 --- /dev/null +++ b/src/resources/map/mapconsts.h @@ -0,0 +1,28 @@ +/* + * 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_MAPCONSTS_H +#define RESOURCES_MAP_MAPCONSTS_H + +static const int mapTileSize = 32; + +#endif // RESOURCES_MAP_MAPCONSTS_H diff --git a/src/resources/map/speciallayer.cpp b/src/resources/map/speciallayer.cpp index 2ebb6ef51..284069589 100644 --- a/src/resources/map/speciallayer.cpp +++ b/src/resources/map/speciallayer.cpp @@ -20,7 +20,7 @@ #include "resources/map/speciallayer.h" -#include "resources/map/map.h" +#include "resources/map/mapconsts.h" #include "resources/map/mapitem.h" #include "resources/map/maplayer.h" |