diff options
| author | Guillaume Melquiond <guillaume.melquiond@gmail.com> | 2007-09-22 18:45:57 +0000 |
|---|---|---|
| committer | Guillaume Melquiond <guillaume.melquiond@gmail.com> | 2007-09-22 18:45:57 +0000 |
| commit | ac5375e554e882e0b56eeed9b6e51c06c8d37656 (patch) | |
| tree | 8c0095d23e880ab112dacc7e94505aac86d04dd7 /src/game-server/mapreader.cpp | |
| parent | 88e3d219588052a8ab222ab4f6f2b27c9c29c1b2 (diff) | |
| download | manaserv-ac5375e554e882e0b56eeed9b6e51c06c8d37656.tar.gz manaserv-ac5375e554e882e0b56eeed9b6e51c06c8d37656.tar.bz2 manaserv-ac5375e554e882e0b56eeed9b6e51c06c8d37656.tar.xz manaserv-ac5375e554e882e0b56eeed9b6e51c06c8d37656.zip | |
Cleaned both configuration and resource managers.
Diffstat (limited to 'src/game-server/mapreader.cpp')
| -rw-r--r-- | src/game-server/mapreader.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/game-server/mapreader.cpp b/src/game-server/mapreader.cpp index 9c062cb5..f961efd2 100644 --- a/src/game-server/mapreader.cpp +++ b/src/game-server/mapreader.cpp @@ -21,12 +21,13 @@ * $Id$ */ -#include "resourcemanager.h" +#include "game-server/mapreader.hpp" + #include "game-server/map.hpp" #include "game-server/mapcomposite.hpp" #include "game-server/mapmanager.hpp" -#include "game-server/mapreader.hpp" #include "game-server/monstermanager.hpp" +#include "game-server/resourcemanager.hpp" #include "game-server/spawnarea.hpp" #include "game-server/trigger.hpp" #include "scripting/script.hpp" @@ -43,10 +44,8 @@ static void setTileWithGid(Map *map, int x, int y, int gid); void MapReader::readMap(const std::string &filename, MapComposite *composite) { - // Load the file through resource manager. - ResourceManager *resman = ResourceManager::getInstance(); int fileSize; - char *buffer = (char *)resman->loadFile(filename, fileSize); + char *buffer = ResourceManager::loadFile(filename, fileSize); if (buffer == NULL) { |