diff options
author | David Walter Seikel | 2012-02-25 01:36:02 +1000 |
---|---|---|
committer | David Walter Seikel | 2012-02-25 01:36:02 +1000 |
commit | db634cda56ca8eca2ddab728d1a95dc9fbd36eba (patch) | |
tree | cfd3e4930c4edfa416cd2edacc858a51a6591c62 /LuaSL/src/LuaSL.h | |
parent | Moved luaproc into LuaSL, merged it all into it's own file, and replaced the ... (diff) | |
download | SledjHamr-db634cda56ca8eca2ddab728d1a95dc9fbd36eba.zip SledjHamr-db634cda56ca8eca2ddab728d1a95dc9fbd36eba.tar.gz SledjHamr-db634cda56ca8eca2ddab728d1a95dc9fbd36eba.tar.bz2 SledjHamr-db634cda56ca8eca2ddab728d1a95dc9fbd36eba.tar.xz |
Remove a whole bunch of stuff we don't need from our luaproc fork, and rearrange what's left.
Diffstat (limited to 'LuaSL/src/LuaSL.h')
-rw-r--r-- | LuaSL/src/LuaSL.h | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/LuaSL/src/LuaSL.h b/LuaSL/src/LuaSL.h index d27f501..68deec5 100644 --- a/LuaSL/src/LuaSL.h +++ b/LuaSL/src/LuaSL.h | |||
@@ -14,6 +14,14 @@ | |||
14 | #include <stdio.h> | 14 | #include <stdio.h> |
15 | #include <ctype.h> | 15 | #include <ctype.h> |
16 | 16 | ||
17 | #include <lua.h> | ||
18 | #include <luajit.h> | ||
19 | #include <lualib.h> | ||
20 | #include <lauxlib.h> | ||
21 | |||
22 | #include "LuaSL_threads.h" | ||
23 | |||
24 | |||
17 | #define WIDTH (1024) | 25 | #define WIDTH (1024) |
18 | #define HEIGHT (768) | 26 | #define HEIGHT (768) |
19 | 27 | ||
@@ -62,17 +70,26 @@ typedef struct | |||
62 | 70 | ||
63 | typedef struct | 71 | typedef struct |
64 | { | 72 | { |
73 | Eina_Clist node; | ||
74 | gameGlobals *game; | ||
65 | char SID[PATH_MAX]; | 75 | char SID[PATH_MAX]; |
66 | char fileName[PATH_MAX]; | 76 | char fileName[PATH_MAX]; |
77 | lua_State *lstate; | ||
67 | struct timeval startTime; | 78 | struct timeval startTime; |
68 | float compileTime, timerTime; | 79 | float compileTime, timerTime; |
69 | int bugs, warnings; | 80 | int bugs, warnings; |
70 | boolean running; | 81 | boolean running; |
71 | gameGlobals *game; | ||
72 | Ecore_Con_Client *client; | 82 | Ecore_Con_Client *client; |
73 | Ecore_Timer *timer; | 83 | Ecore_Timer *timer; |
74 | } script; | 84 | } script; |
75 | 85 | ||
86 | //struct stluaproc { | ||
87 | // int stat; | ||
88 | // int args; | ||
89 | // channel chan; | ||
90 | // void *data; | ||
91 | //}; | ||
92 | |||
76 | typedef struct | 93 | typedef struct |
77 | { | 94 | { |
78 | script *script; | 95 | script *script; |
@@ -82,6 +99,7 @@ typedef struct | |||
82 | 99 | ||
83 | void loggingStartup(gameGlobals *game); | 100 | void loggingStartup(gameGlobals *game); |
84 | char *getDateTime(struct tm **nowOut, char *dateOut, time_t *tiemOut); | 101 | char *getDateTime(struct tm **nowOut, char *dateOut, time_t *tiemOut); |
102 | void scriptSendBack(void * data); | ||
85 | void sendBack(gameGlobals *game, Ecore_Con_Client *client, const char *SID, const char *message, ...); | 103 | void sendBack(gameGlobals *game, Ecore_Con_Client *client, const char *SID, const char *message, ...); |
86 | void sendForth(gameGlobals *game, const char *SID, const char *message, ...); | 104 | void sendForth(gameGlobals *game, const char *SID, const char *message, ...); |
87 | float timeDiff(struct timeval *now, struct timeval *then); | 105 | float timeDiff(struct timeval *now, struct timeval *then); |