From 6b7441516002d6e7cca424416bb67c6bc7d7c9d2 Mon Sep 17 00:00:00 2001 From: Guillaume Melquiond Date: Tue, 2 Jan 2007 22:41:02 +0000 Subject: Simplified MapReader interface and code. Fixed some memory leaks. --- src/mapreader.h | 109 -------------------------------------------------------- 1 file changed, 109 deletions(-) delete mode 100644 src/mapreader.h (limited to 'src/mapreader.h') diff --git a/src/mapreader.h b/src/mapreader.h deleted file mode 100644 index fe395e3..0000000 --- a/src/mapreader.h +++ /dev/null @@ -1,109 +0,0 @@ -/* - * The Mana World - * Copyright 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * The Mana World 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. - * - * The Mana World 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 The Mana World; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ - */ - -#ifndef _INCLUDED_MAPREADER_H -#define _INCLUDED_MAPREADER_H - -#include -#include - -class Map; - - -/** - * A tileset, which is on the server only used to store a firstgid. - */ -class Tileset -{ - public: - /** - * Constructor. - */ - Tileset(int w, int h, int firstGid): - mFirstGid(firstGid) - { - } - - /** - * Returns the first gid. - */ - int - getFirstGid() { return mFirstGid; } - - private: - int mFirstGid; -}; - -/** - * Reader for XML map files (*.tmx) - */ -class MapReader -{ - public: - /** - * Read an XML map from a file. - */ - static Map *readMap(const std::string &filename); - - /** - * Read an XML map from a parsed XML tree. The path is used to find the - * location of referenced tileset images. - */ - static Map *readMap(xmlNodePtr node, const std::string &path); - - private: - /** - * Reads a map layer. - */ - static void - readLayer(xmlNodePtr node, Map *map, int layer); - - /** - * Reads a tile set. - */ - static Tileset* - readTileset(xmlNodePtr node, const std::string &path, Map *map); - - /** - * Gets an integer property from an xmlNodePtr. - */ - static int - getProperty(xmlNodePtr node, const char* name, int def); - - /** - * Finds the tile set that a tile with the given global id is part of. - */ - static Tileset* - getTilesetWithGid(int gid); - - /** - * Sets a tile using a global tile id. Used by the layer loading - * routine. - */ - static void - setTileWithGid(Map *map, int x, int y, int layer, int gid); - - static std::vector tilesets; -}; - -#endif -- cgit