diff options
author | David Walter Seikel | 2012-02-25 06:13:18 +1000 |
---|---|---|
committer | David Walter Seikel | 2012-02-25 06:13:18 +1000 |
commit | 4f7d3205f502db5942ae18732f7aa634a72d72b2 (patch) | |
tree | 1a11da78cb21c0afda5cab94c5f9108cdb3ae864 /LuaSL/src/LuaSL.h | |
parent | Merge the luaproc structure into the script structure, and use that instead. (diff) | |
download | SledjHamr-4f7d3205f502db5942ae18732f7aa634a72d72b2.zip SledjHamr-4f7d3205f502db5942ae18732f7aa634a72d72b2.tar.gz SledjHamr-4f7d3205f502db5942ae18732f7aa634a72d72b2.tar.bz2 SledjHamr-4f7d3205f502db5942ae18732f7aa634a72d72b2.tar.xz |
Partial rewrite of the luaproc messages. Still not fixed yet.
Diffstat (limited to '')
-rw-r--r-- | LuaSL/src/LuaSL.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/LuaSL/src/LuaSL.h b/LuaSL/src/LuaSL.h index 936477f..057788b 100644 --- a/LuaSL/src/LuaSL.h +++ b/LuaSL/src/LuaSL.h | |||
@@ -19,7 +19,8 @@ | |||
19 | #include <lualib.h> | 19 | #include <lualib.h> |
20 | #include <lauxlib.h> | 20 | #include <lauxlib.h> |
21 | 21 | ||
22 | typedef struct _script script; // Define this here, so LuaSL_threads.h can use it. | 22 | typedef struct _script script; // Define this here, so LuaSL_threads.h can use it. |
23 | typedef struct _gameGlobals gameGlobals; // Define this here, so LuaSL_threads.h can use it. | ||
23 | 24 | ||
24 | #include "LuaSL_threads.h" | 25 | #include "LuaSL_threads.h" |
25 | 26 | ||
@@ -56,7 +57,7 @@ typedef enum | |||
56 | } boolean; | 57 | } boolean; |
57 | #endif | 58 | #endif |
58 | 59 | ||
59 | typedef struct | 60 | struct _gameGlobals |
60 | { | 61 | { |
61 | Ecore_Evas *ee; // Our window. | 62 | Ecore_Evas *ee; // Our window. |
62 | Evas *canvas; // The canvas for drawing directly onto. | 63 | Evas *canvas; // The canvas for drawing directly onto. |
@@ -68,7 +69,7 @@ typedef struct | |||
68 | const char *address; | 69 | const char *address; |
69 | int port; | 70 | int port; |
70 | boolean ui; // Wether we actually start up the UI. | 71 | boolean ui; // Wether we actually start up the UI. |
71 | } gameGlobals; | 72 | }; |
72 | 73 | ||
73 | struct _script | 74 | struct _script |
74 | { | 75 | { |
@@ -84,12 +85,14 @@ struct _script | |||
84 | int status; | 85 | int status; |
85 | int args; | 86 | int args; |
86 | channel chan; | 87 | channel chan; |
88 | Eina_Clist messages; | ||
87 | Ecore_Con_Client *client; | 89 | Ecore_Con_Client *client; |
88 | Ecore_Timer *timer; | 90 | Ecore_Timer *timer; |
89 | }; | 91 | }; |
90 | 92 | ||
91 | typedef struct | 93 | typedef struct |
92 | { | 94 | { |
95 | Eina_Clist node; | ||
93 | script *script; | 96 | script *script; |
94 | const char message[PATH_MAX]; | 97 | const char message[PATH_MAX]; |
95 | } scriptMessage; | 98 | } scriptMessage; |