diff options
Diffstat (limited to '')
-rw-r--r-- | src/LuaSL/LuaSL_main.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/LuaSL/LuaSL_main.c b/src/LuaSL/LuaSL_main.c index 0a40712..f4c94ac 100644 --- a/src/LuaSL/LuaSL_main.c +++ b/src/LuaSL/LuaSL_main.c | |||
@@ -2,6 +2,7 @@ | |||
2 | #include "LuaSL.h" | 2 | #include "LuaSL.h" |
3 | 3 | ||
4 | 4 | ||
5 | int logDom; // Our logging domain. | ||
5 | static int CPUs = 4; | 6 | static int CPUs = 4; |
6 | static Eina_Strbuf *clientStream; | 7 | static Eina_Strbuf *clientStream; |
7 | 8 | ||
@@ -43,7 +44,7 @@ static script *findThem(gameGlobals *ourGlobals, const char *base, const char *t | |||
43 | 44 | ||
44 | static void resetScript(script *victim) | 45 | static void resetScript(script *victim) |
45 | { | 46 | { |
46 | gameGlobals *ourGlobals = victim->game; | 47 | // gameGlobals *ourGlobals = victim->game; |
47 | 48 | ||
48 | PD("Resetting %s", victim->fileName); | 49 | PD("Resetting %s", victim->fileName); |
49 | // TODO - now what? | 50 | // TODO - now what? |
@@ -206,7 +207,7 @@ static Eina_Bool _data(void *data, int type __UNUSED__, Ecore_Con_Event_Client_D | |||
206 | 207 | ||
207 | static Eina_Bool _del(void *data, int type __UNUSED__, Ecore_Con_Event_Client_Del *ev) | 208 | static Eina_Bool _del(void *data, int type __UNUSED__, Ecore_Con_Event_Client_Del *ev) |
208 | { | 209 | { |
209 | gameGlobals *ourGlobals = data; | 210 | // gameGlobals *ourGlobals = data; |
210 | 211 | ||
211 | if (ev->client) | 212 | if (ev->client) |
212 | { | 213 | { |
@@ -228,7 +229,7 @@ int main(int argc, char **argv) | |||
228 | 229 | ||
229 | if (eina_init()) | 230 | if (eina_init()) |
230 | { | 231 | { |
231 | ourGlobals.logDom = loggingStartup("LuaSL", ourGlobals.logDom); | 232 | logDom = loggingStartup("LuaSL", logDom); |
232 | ourGlobals.scripts = eina_hash_string_superfast_new(NULL); | 233 | ourGlobals.scripts = eina_hash_string_superfast_new(NULL); |
233 | ourGlobals.names = eina_hash_string_superfast_new(NULL); | 234 | ourGlobals.names = eina_hash_string_superfast_new(NULL); |
234 | if (ecore_con_init()) | 235 | if (ecore_con_init()) |
@@ -256,7 +257,7 @@ int main(int argc, char **argv) | |||
256 | for (i = 0; i < CPUs; i++) | 257 | for (i = 0; i < CPUs; i++) |
257 | { | 258 | { |
258 | if ( sched_create_worker( ) != LUAPROC_SCHED_OK ) | 259 | if ( sched_create_worker( ) != LUAPROC_SCHED_OK ) |
259 | PEm("Error creating luaproc worker thread."); | 260 | PE("Error creating luaproc worker thread."); |
260 | } | 261 | } |
261 | ecore_main_loop_begin(); | 262 | ecore_main_loop_begin(); |
262 | 263 | ||
@@ -265,18 +266,18 @@ int main(int argc, char **argv) | |||
265 | edje_shutdown(); | 266 | edje_shutdown(); |
266 | } | 267 | } |
267 | else | 268 | else |
268 | PCm("Failed to init edje!"); | 269 | PC("Failed to init edje!"); |
269 | } | 270 | } |
270 | else | 271 | else |
271 | PCm("Failed to add server!"); | 272 | PC("Failed to add server!"); |
272 | ecore_con_shutdown(); | 273 | ecore_con_shutdown(); |
273 | } | 274 | } |
274 | else | 275 | else |
275 | PCm("Failed to init ecore_con!"); | 276 | PC("Failed to init ecore_con!"); |
276 | ecore_shutdown(); | 277 | ecore_shutdown(); |
277 | } | 278 | } |
278 | else | 279 | else |
279 | PCm("Failed to init ecore!"); | 280 | PC("Failed to init ecore!"); |
280 | } | 281 | } |
281 | else | 282 | else |
282 | fprintf(stderr, "Failed to init eina!"); | 283 | fprintf(stderr, "Failed to init eina!"); |