summaryrefslogtreecommitdiff
path: root/src/scripting/script.cpp
diff options
context:
space:
mode:
authorDavid Athay <ko2fan@gmail.com>2009-01-27 17:14:34 +0000
committerDavid Athay <ko2fan@gmail.com>2009-01-27 17:14:34 +0000
commitfa5469bd27d117abd98ca58dad61a6378fe8215c (patch)
tree81e04d035dfc54fa9f4cca62523232ce567c9ce6 /src/scripting/script.cpp
parentf666fd38beefb554d90503811e5a43d504a18345 (diff)
parentc423c02890cfb4520da0ac75e00d1bd9f1663ce0 (diff)
downloadmanaserv-fa5469bd27d117abd98ca58dad61a6378fe8215c.tar.gz
manaserv-fa5469bd27d117abd98ca58dad61a6378fe8215c.tar.bz2
manaserv-fa5469bd27d117abd98ca58dad61a6378fe8215c.tar.xz
manaserv-fa5469bd27d117abd98ca58dad61a6378fe8215c.zip
Merge branch 'master' of git@gitorious.org:tmwserv/mainline
Diffstat (limited to 'src/scripting/script.cpp')
-rw-r--r--src/scripting/script.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/scripting/script.cpp b/src/scripting/script.cpp
index ea1721f9..a20efb5c 100644
--- a/src/scripting/script.cpp
+++ b/src/scripting/script.cpp
@@ -69,14 +69,18 @@ void Script::update()
execute();
}
-void Script::loadFile(std::string const &name)
+bool Script::loadFile(std::string const &name)
{
int size;
char *buffer = ResourceManager::loadFile(name, size);
if (buffer)
{
+ mScriptFile = name;
load(buffer);
free(buffer);
+ return true;
+ } else {
+ return false;
}
}