From ac5375e554e882e0b56eeed9b6e51c06c8d37656 Mon Sep 17 00:00:00 2001 From: Guillaume Melquiond Date: Sat, 22 Sep 2007 18:45:57 +0000 Subject: Cleaned both configuration and resource managers. --- src/game-server/itemmanager.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/game-server/itemmanager.cpp') diff --git a/src/game-server/itemmanager.cpp b/src/game-server/itemmanager.cpp index 232d427..93906e6 100644 --- a/src/game-server/itemmanager.cpp +++ b/src/game-server/itemmanager.cpp @@ -26,8 +26,8 @@ #include "game-server/itemmanager.hpp" #include "defines.h" -#include "resourcemanager.h" #include "game-server/item.hpp" +#include "game-server/resourcemanager.hpp" #include "utils/logger.h" #include "utils/xml.hpp" @@ -43,9 +43,8 @@ void ItemManager::initialize(std::string const &file) void ItemManager::reload() { - ResourceManager *resman = ResourceManager::getInstance(); int size; - char *data = (char *)resman->loadFile(itemReferenceFile, size); + char *data = ResourceManager::loadFile(itemReferenceFile, size); if (!data) { LOG_ERROR("Item Manager: Could not find " << itemReferenceFile << "!"); -- cgit