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/itemmanager.cpp | |
| parent | 88e3d219588052a8ab222ab4f6f2b27c9c29c1b2 (diff) | |
| download | manaserv-ac5375e554e882e0b56eeed9b6e51c06c8d37656.tar.gz manaserv-ac5375e554e882e0b56eeed9b6e51c06c8d37656.tar.xz manaserv-ac5375e554e882e0b56eeed9b6e51c06c8d37656.zip | |
Cleaned both configuration and resource managers.
Diffstat (limited to 'src/game-server/itemmanager.cpp')
| -rw-r--r-- | src/game-server/itemmanager.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
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 << "!"); |