diff options
| author | Erik Schilling <ablu.erikschilling@googlemail.com> | 2013-02-21 07:29:58 +0100 |
|---|---|---|
| committer | Erik Schilling <ablu.erikschilling@googlemail.com> | 2013-02-21 07:29:58 +0100 |
| commit | f93b4c25242370982715e1a83c11e667b17f20af (patch) | |
| tree | 07b392040bd858e205d12cf8f0977cf82fcc2c90 /src/scripting/luascript.h | |
| parent | bcb3f283bda155bec33c83c4627f59acb4616dd8 (diff) | |
| parent | 4559ca444daacfd02ebb05f1657148a2b4cf3d8b (diff) | |
| download | manaserv-f93b4c25242370982715e1a83c11e667b17f20af.tar.gz manaserv-f93b4c25242370982715e1a83c11e667b17f20af.tar.bz2 manaserv-f93b4c25242370982715e1a83c11e667b17f20af.tar.xz manaserv-f93b4c25242370982715e1a83c11e667b17f20af.zip | |
Merge branch 'master' into lpc2012
Diffstat (limited to 'src/scripting/luascript.h')
| -rw-r--r-- | src/scripting/luascript.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/scripting/luascript.h b/src/scripting/luascript.h index 9515bf0e..3bedbc28 100644 --- a/src/scripting/luascript.h +++ b/src/scripting/luascript.h @@ -44,7 +44,8 @@ class LuaScript : public Script ~LuaScript(); - void load(const char *prog, const char *name); + void load(const char *prog, const char *name, + const Context &context = Context()); Thread *newThread(); @@ -60,7 +61,7 @@ class LuaScript : public Script void push(const std::list<InventoryItem> &itemList); - int execute(); + int execute(const Context &context = Context()); bool resume(); |