diff options
author | David Walter Seikel | 2014-05-23 13:22:36 +1000 |
---|---|---|
committer | David Walter Seikel | 2014-05-23 13:22:36 +1000 |
commit | f97c73bd1e43a0eb32ad8dc43fc28f6e40b28f38 (patch) | |
tree | df45770acc4a26d56e45bc7ae3420cddb6522d15 /src/LuaSL/LuaSL.h | |
parent | TODO-- (diff) | |
download | SledjHamr-f97c73bd1e43a0eb32ad8dc43fc28f6e40b28f38.zip SledjHamr-f97c73bd1e43a0eb32ad8dc43fc28f6e40b28f38.tar.gz SledjHamr-f97c73bd1e43a0eb32ad8dc43fc28f6e40b28f38.tar.bz2 SledjHamr-f97c73bd1e43a0eb32ad8dc43fc28f6e40b28f38.tar.xz |
Rewrite the LuaSL script running stuff (twice lol), plus much related tweakage and cleanups.
Diffstat (limited to '')
-rw-r--r-- | src/LuaSL/LuaSL.h | 31 |
1 files changed, 2 insertions, 29 deletions
diff --git a/src/LuaSL/LuaSL.h b/src/LuaSL/LuaSL.h index 299477b..cfee0aa 100644 --- a/src/LuaSL/LuaSL.h +++ b/src/LuaSL/LuaSL.h | |||
@@ -16,46 +16,19 @@ | |||
16 | #include <lualib.h> | 16 | #include <lualib.h> |
17 | #include <lauxlib.h> | 17 | #include <lauxlib.h> |
18 | 18 | ||
19 | typedef struct _script script; // Define this here, so LuaSL_threads.h can use it. | ||
20 | typedef struct _gameGlobals gameGlobals; // Define this here, so LuaSL_threads.h can use it. | 19 | typedef struct _gameGlobals gameGlobals; // Define this here, so LuaSL_threads.h can use it. |
21 | 20 | ||
22 | #include "LuaSL_threads.h" | ||
23 | #include "LumbrJack.h" | 21 | #include "LumbrJack.h" |
22 | #include "Runnr.h" | ||
24 | 23 | ||
25 | 24 | ||
26 | struct _gameGlobals | 25 | struct _gameGlobals |
27 | { | 26 | { |
28 | Ecore_Con_Server *server; | 27 | Ecore_Con_Server *server; |
29 | Eina_Hash *scripts, *names; | 28 | Eina_Hash *names; |
30 | const char *address; | 29 | const char *address; |
31 | int port; | 30 | int port; |
32 | }; | 31 | }; |
33 | 32 | ||
34 | struct _script | ||
35 | { | ||
36 | Eina_Clist node; | ||
37 | gameGlobals *game; | ||
38 | char SID[PATH_MAX]; | ||
39 | char fileName[PATH_MAX]; | ||
40 | char *name; | ||
41 | lua_State *L; | ||
42 | struct timeval startTime; | ||
43 | float timerTime; | ||
44 | int status; | ||
45 | int args; | ||
46 | Eina_Clist messages; | ||
47 | Ecore_Con_Client *client; | ||
48 | Ecore_Timer *timer; | ||
49 | }; | ||
50 | |||
51 | typedef struct | ||
52 | { | ||
53 | Eina_Clist node; | ||
54 | script *script; | ||
55 | const char message[PATH_MAX]; | ||
56 | } scriptMessage; | ||
57 | |||
58 | |||
59 | void scriptSendBack(void * data); | ||
60 | 33 | ||
61 | #include "LuaSL_LSL_tree.h" | 34 | #include "LuaSL_LSL_tree.h" |