aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/src/GuiLua
diff options
context:
space:
mode:
authorDavid Walter Seikel2014-05-16 18:56:44 +1000
committerDavid Walter Seikel2014-05-16 18:56:44 +1000
commitdbf4b2b338273b037d28234ed9bc025af8bb565e (patch)
treeab6df20a0194b7af597b1098d55ea96735f2b5e5 /src/GuiLua
parentBring back the dangerous push_lua() calls. Trying to debug this. (diff)
downloadSledjHamr-dbf4b2b338273b037d28234ed9bc025af8bb565e.zip
SledjHamr-dbf4b2b338273b037d28234ed9bc025af8bb565e.tar.gz
SledjHamr-dbf4b2b338273b037d28234ed9bc025af8bb565e.tar.bz2
SledjHamr-dbf4b2b338273b037d28234ed9bc025af8bb565e.tar.xz
Stick the connection to the love server in the GuiLua structure, and related tweakage.
Diffstat (limited to 'src/GuiLua')
-rw-r--r--src/GuiLua/GuiLua.c3
-rw-r--r--src/GuiLua/GuiLua.h3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/GuiLua/GuiLua.c b/src/GuiLua/GuiLua.c
index 65e0d79..f2de1ea 100644
--- a/src/GuiLua/GuiLua.c
+++ b/src/GuiLua/GuiLua.c
@@ -429,7 +429,7 @@ GuiLua *GuiLuaDo(int argc, char **argv, winFang *parent, EPhysics_World *world)
429 return result; 429 return result;
430} 430}
431 431
432GuiLua *GuiLuaLoad(char *module, winFang *parent, EPhysics_World *world) 432GuiLua *GuiLuaLoad(char *module, winFang *parent, Ecore_Con_Server *server, EPhysics_World *world)
433{ 433{
434 GuiLua *result; 434 GuiLua *result;
435 char *args[] = {"GuiLUa", "-l", ""}; 435 char *args[] = {"GuiLUa", "-l", ""};
@@ -437,6 +437,7 @@ GuiLua *GuiLuaLoad(char *module, winFang *parent, EPhysics_World *world)
437 args[2] = module; 437 args[2] = module;
438 result = GuiLuaDo(3, args, parent, world); 438 result = GuiLuaDo(3, args, parent, world);
439 result->name = module; 439 result->name = module;
440 result->server = server;
440 return result; 441 return result;
441} 442}
442 443
diff --git a/src/GuiLua/GuiLua.h b/src/GuiLua/GuiLua.h
index 9ee5a1f..cf94e1f 100644
--- a/src/GuiLua/GuiLua.h
+++ b/src/GuiLua/GuiLua.h
@@ -22,6 +22,7 @@ typedef struct _GuiLua
22 winFang *us; // Our window, if it exists. 22 winFang *us; // Our window, if it exists.
23 winFang *parent; // Our parent window, if it exists. 23 winFang *parent; // Our parent window, if it exists.
24 EPhysics_World *world; // Our world, if it exists. 24 EPhysics_World *world; // Our world, if it exists.
25 Ecore_Con_Server *server;
25 int inDel; 26 int inDel;
26 27
27 Eina_Clist node; 28 Eina_Clist node;
@@ -32,7 +33,7 @@ typedef struct _GuiLua
32extern const char *glName; 33extern const char *glName;
33 34
34GuiLua *GuiLuaDo(int argc, char **argv, winFang *parent, EPhysics_World *world); 35GuiLua *GuiLuaDo(int argc, char **argv, winFang *parent, EPhysics_World *world);
35GuiLua *GuiLuaLoad(char *module, winFang *parent, EPhysics_World *world); 36GuiLua *GuiLuaLoad(char *module, winFang *parent, Ecore_Con_Server *server, EPhysics_World *world);
36void GuiLuaDel(GuiLua *gl); 37void GuiLuaDel(GuiLua *gl);
37 38
38#endif 39#endif