diff options
author | David Walter Seikel | 2012-02-25 03:34:13 +1000 |
---|---|---|
committer | David Walter Seikel | 2012-02-25 03:34:13 +1000 |
commit | 4d95970ef86f8387bc9a509112153a74f82e016c (patch) | |
tree | c158b27f151377c2b9ce380d6939ae5e6192b92e /LuaSL/src | |
parent | Remove a whole bunch of stuff we don't need from our luaproc fork, and rearra... (diff) | |
download | SledjHamr-4d95970ef86f8387bc9a509112153a74f82e016c.zip SledjHamr-4d95970ef86f8387bc9a509112153a74f82e016c.tar.gz SledjHamr-4d95970ef86f8387bc9a509112153a74f82e016c.tar.bz2 SledjHamr-4d95970ef86f8387bc9a509112153a74f82e016c.tar.xz |
Merge the luaproc and script structures, but not using it yet.
Diffstat (limited to 'LuaSL/src')
-rw-r--r-- | LuaSL/src/LuaSL.h | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/LuaSL/src/LuaSL.h b/LuaSL/src/LuaSL.h index 68deec5..bde4c2f 100644 --- a/LuaSL/src/LuaSL.h +++ b/LuaSL/src/LuaSL.h | |||
@@ -19,6 +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. | ||
23 | |||
22 | #include "LuaSL_threads.h" | 24 | #include "LuaSL_threads.h" |
23 | 25 | ||
24 | 26 | ||
@@ -68,7 +70,7 @@ typedef struct | |||
68 | boolean ui; // Wether we actually start up the UI. | 70 | boolean ui; // Wether we actually start up the UI. |
69 | } gameGlobals; | 71 | } gameGlobals; |
70 | 72 | ||
71 | typedef struct | 73 | struct _script |
72 | { | 74 | { |
73 | Eina_Clist node; | 75 | Eina_Clist node; |
74 | gameGlobals *game; | 76 | gameGlobals *game; |
@@ -79,16 +81,12 @@ typedef struct | |||
79 | float compileTime, timerTime; | 81 | float compileTime, timerTime; |
80 | int bugs, warnings; | 82 | int bugs, warnings; |
81 | boolean running; | 83 | boolean running; |
84 | int status; | ||
85 | int args; | ||
86 | channel chan; | ||
82 | Ecore_Con_Client *client; | 87 | Ecore_Con_Client *client; |
83 | Ecore_Timer *timer; | 88 | Ecore_Timer *timer; |
84 | } script; | 89 | }; |
85 | |||
86 | //struct stluaproc { | ||
87 | // int stat; | ||
88 | // int args; | ||
89 | // channel chan; | ||
90 | // void *data; | ||
91 | //}; | ||
92 | 90 | ||
93 | typedef struct | 91 | typedef struct |
94 | { | 92 | { |