From 78c912fb4007c3e5f0b43de02646772acb21ecf2 Mon Sep 17 00:00:00 2001 From: Thorbjørn Lindeijer Date: Fri, 9 Mar 2012 21:30:42 +0100 Subject: Moved the managing of NPC script coroutines into C++ Rather than wrapping NPC functions up in coroutines in the Lua side, they are now managed on the C++ side as "script threads", which are essentially the same thing. The main purpose is that the server can now know whether any of these long running script interactions are still active, which will probably be useful when adding the ability to reload scripts. Reviewed-by: Erik Schilling --- src/scripting/luautil.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/scripting/luautil.h') diff --git a/src/scripting/luautil.h b/src/scripting/luautil.h index 2a255280..89ea4800 100644 --- a/src/scripting/luautil.h +++ b/src/scripting/luautil.h @@ -21,10 +21,13 @@ #ifndef SCRIPTING_LUAUTIL_H #define SCRIPTING_LUAUTIL_H +#include "scripting/script.h" + extern "C" { #include #include } + #include #include #include @@ -39,7 +42,6 @@ class MapObject; class Monster; class MonsterClass; class NPC; -class Script; class StatusEffect; class Thing; @@ -168,6 +170,7 @@ MonsterClass * checkMonsterClass(lua_State *s, int p); NPC * checkNPC(lua_State *s, int p); MapComposite * checkCurrentMap(lua_State *s, Script *script = 0); +Script::Thread* checkCurrentThread(lua_State *s, Script *script = 0); /* Polymorphic wrapper for pushing variables. -- cgit v1.2.3-60-g2f50