diff options
author | David Walter Seikel | 2014-05-17 07:54:29 +1000 |
---|---|---|
committer | David Walter Seikel | 2014-05-17 07:54:29 +1000 |
commit | 2b4c37a4cb6457c1af42617e0d3a58b21025293c (patch) | |
tree | a92f4848c2e3f1713dfd30e0f095c059c8f4ea68 | |
parent | More debugging removal. (diff) | |
download | SledjHamr-2b4c37a4cb6457c1af42617e0d3a58b21025293c.zip SledjHamr-2b4c37a4cb6457c1af42617e0d3a58b21025293c.tar.gz SledjHamr-2b4c37a4cb6457c1af42617e0d3a58b21025293c.tar.bz2 SledjHamr-2b4c37a4cb6457c1af42617e0d3a58b21025293c.tar.xz |
Make sure the server actually gets through to things started by GuiLuaLoad().
-rw-r--r-- | src/GuiLua/GuiLua.c | 6 | ||||
-rw-r--r-- | src/GuiLua/GuiLua.h | 2 | ||||
-rw-r--r-- | src/GuiLua/skang.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/GuiLua/GuiLua.c b/src/GuiLua/GuiLua.c index 94a0909..3bdada9 100644 --- a/src/GuiLua/GuiLua.c +++ b/src/GuiLua/GuiLua.c | |||
@@ -431,7 +431,7 @@ PD("GuiLua 3"); | |||
431 | return 1; | 431 | return 1; |
432 | } | 432 | } |
433 | 433 | ||
434 | GuiLua *GuiLuaDo(int argc, char **argv, winFang *parent, EPhysics_World *world) | 434 | GuiLua *GuiLuaDo(int argc, char **argv, winFang *parent, Ecore_Con_Server *server, EPhysics_World *world) |
435 | { | 435 | { |
436 | GuiLua *result; | 436 | GuiLua *result; |
437 | lua_State *L; | 437 | lua_State *L; |
@@ -439,6 +439,7 @@ GuiLua *GuiLuaDo(int argc, char **argv, winFang *parent, EPhysics_World *world) | |||
439 | 439 | ||
440 | result = calloc(1, sizeof(GuiLua)); | 440 | result = calloc(1, sizeof(GuiLua)); |
441 | result->parent = parent; | 441 | result->parent = parent; |
442 | result->server = server; | ||
442 | result->world = world; | 443 | result->world = world; |
443 | 444 | ||
444 | L = luaL_newstate(); | 445 | L = luaL_newstate(); |
@@ -499,9 +500,8 @@ GuiLua *GuiLuaLoad(char *module, winFang *parent, Ecore_Con_Server *server, EPhy | |||
499 | char *args[] = {"GuiLUa", "-l", ""}; | 500 | char *args[] = {"GuiLUa", "-l", ""}; |
500 | 501 | ||
501 | args[2] = module; | 502 | args[2] = module; |
502 | result = GuiLuaDo(3, args, parent, world); | 503 | result = GuiLuaDo(3, args, parent, server, world); |
503 | result->name = module; | 504 | result->name = module; |
504 | result->server = server; | ||
505 | return result; | 505 | return result; |
506 | } | 506 | } |
507 | 507 | ||
diff --git a/src/GuiLua/GuiLua.h b/src/GuiLua/GuiLua.h index cf94e1f..9911ec5 100644 --- a/src/GuiLua/GuiLua.h +++ b/src/GuiLua/GuiLua.h | |||
@@ -32,7 +32,7 @@ typedef struct _GuiLua | |||
32 | 32 | ||
33 | extern const char *glName; | 33 | extern const char *glName; |
34 | 34 | ||
35 | GuiLua *GuiLuaDo(int argc, char **argv, winFang *parent, EPhysics_World *world); | 35 | GuiLua *GuiLuaDo(int argc, char **argv, winFang *parent, Ecore_Con_Server *server, EPhysics_World *world); |
36 | GuiLua *GuiLuaLoad(char *module, winFang *parent, Ecore_Con_Server *server, EPhysics_World *world); | 36 | GuiLua *GuiLuaLoad(char *module, winFang *parent, Ecore_Con_Server *server, EPhysics_World *world); |
37 | void GuiLuaDel(GuiLua *gl); | 37 | void GuiLuaDel(GuiLua *gl); |
38 | 38 | ||
diff --git a/src/GuiLua/skang.c b/src/GuiLua/skang.c index c116f30..967a354 100644 --- a/src/GuiLua/skang.c +++ b/src/GuiLua/skang.c | |||
@@ -5,7 +5,7 @@ | |||
5 | EAPI_MAIN int elm_main(int argc, char **argv) | 5 | EAPI_MAIN int elm_main(int argc, char **argv) |
6 | { | 6 | { |
7 | HamrTime(elm_main, "GuiLua"); | 7 | HamrTime(elm_main, "GuiLua"); |
8 | GuiLuaDo(argc, argv, NULL, NULL); | 8 | GuiLuaDo(argc, argv, NULL, NULL, NULL); |
9 | 9 | ||
10 | return 0; | 10 | return 0; |
11 | } | 11 | } |