summaryrefslogtreecommitdiff
path: root/src/scripting/script.cpp
diff options
context:
space:
mode:
authorGuillaume Melquiond <guillaume.melquiond@gmail.com>2007-09-22 18:45:57 +0000
committerGuillaume Melquiond <guillaume.melquiond@gmail.com>2007-09-22 18:45:57 +0000
commitac5375e554e882e0b56eeed9b6e51c06c8d37656 (patch)
tree8c0095d23e880ab112dacc7e94505aac86d04dd7 /src/scripting/script.cpp
parent88e3d219588052a8ab222ab4f6f2b27c9c29c1b2 (diff)
downloadmanaserv-ac5375e554e882e0b56eeed9b6e51c06c8d37656.tar.gz
manaserv-ac5375e554e882e0b56eeed9b6e51c06c8d37656.tar.bz2
manaserv-ac5375e554e882e0b56eeed9b6e51c06c8d37656.tar.xz
manaserv-ac5375e554e882e0b56eeed9b6e51c06c8d37656.zip
Cleaned both configuration and resource managers.
Diffstat (limited to 'src/scripting/script.cpp')
-rw-r--r--src/scripting/script.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/scripting/script.cpp b/src/scripting/script.cpp
index 9666b213..59faaf62 100644
--- a/src/scripting/script.cpp
+++ b/src/scripting/script.cpp
@@ -25,7 +25,7 @@
#include "scripting/script.hpp"
-#include "resourcemanager.h"
+#include "game-server/resourcemanager.hpp"
#include "utils/logger.h"
typedef std::map< std::string, Script::Factory > Engines;
@@ -67,9 +67,8 @@ void Script::update()
void Script::loadFile(std::string const &name)
{
- ResourceManager *resman = ResourceManager::getInstance();
int size;
- char *buffer = (char *)resman->loadFile(name, size);
+ char *buffer = ResourceManager::loadFile(name, size);
if (buffer)
{
load(buffer);