aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/src/GuiLua
diff options
context:
space:
mode:
authorDavid Walter Seikel2014-05-13 18:13:20 +1000
committerDavid Walter Seikel2014-05-13 18:13:20 +1000
commit443133b9b612899777a93fe9371b5f5b27a95984 (patch)
tree8e789d9c6d006b274ab538627770da33941a769e /src/GuiLua
parentAdd a TCP link between love and extantz, and have love pass on some of the co... (diff)
downloadSledjHamr-443133b9b612899777a93fe9371b5f5b27a95984.zip
SledjHamr-443133b9b612899777a93fe9371b5f5b27a95984.tar.gz
SledjHamr-443133b9b612899777a93fe9371b5f5b27a95984.tar.bz2
SledjHamr-443133b9b612899777a93fe9371b5f5b27a95984.tar.xz
GuiLuaLoad() now returns the GuiLua it loaded, and adds the name. Use that for the purkle load in extantz.
Diffstat (limited to 'src/GuiLua')
-rw-r--r--src/GuiLua/GuiLua.c7
-rw-r--r--src/GuiLua/GuiLua.h3
2 files changed, 7 insertions, 3 deletions
diff --git a/src/GuiLua/GuiLua.c b/src/GuiLua/GuiLua.c
index c845ff1..d960da9 100644
--- a/src/GuiLua/GuiLua.c
+++ b/src/GuiLua/GuiLua.c
@@ -429,12 +429,15 @@ GuiLua *GuiLuaDo(int argc, char **argv, winFang *parent, EPhysics_World *world)
429 return result; 429 return result;
430} 430}
431 431
432void GuiLuaLoad(char *module, winFang *parent, EPhysics_World *world) 432GuiLua *GuiLuaLoad(char *module, winFang *parent, EPhysics_World *world)
433{ 433{
434 GuiLua *result;
434 char *args[] = {"GuiLUa", "-l", ""}; 435 char *args[] = {"GuiLUa", "-l", ""};
435 436
436 args[2] = module; 437 args[2] = module;
437 GuiLuaDo(3, args, parent, world); 438 result = GuiLuaDo(3, args, parent, world);
439 result->name = module;
440 return result;
438} 441}
439 442
440void GuiLuaDel(GuiLua *gl) 443void GuiLuaDel(GuiLua *gl)
diff --git a/src/GuiLua/GuiLua.h b/src/GuiLua/GuiLua.h
index 3bd2baf..9ee5a1f 100644
--- a/src/GuiLua/GuiLua.h
+++ b/src/GuiLua/GuiLua.h
@@ -18,6 +18,7 @@
18typedef struct _GuiLua 18typedef struct _GuiLua
19{ 19{
20 lua_State *L; 20 lua_State *L;
21 char *name; // Name of the module.
21 winFang *us; // Our window, if it exists. 22 winFang *us; // Our window, if it exists.
22 winFang *parent; // Our parent window, if it exists. 23 winFang *parent; // Our parent window, if it exists.
23 EPhysics_World *world; // Our world, if it exists. 24 EPhysics_World *world; // Our world, if it exists.
@@ -31,7 +32,7 @@ typedef struct _GuiLua
31extern const char *glName; 32extern const char *glName;
32 33
33GuiLua *GuiLuaDo(int argc, char **argv, winFang *parent, EPhysics_World *world); 34GuiLua *GuiLuaDo(int argc, char **argv, winFang *parent, EPhysics_World *world);
34void GuiLuaLoad(char *module, winFang *parent, EPhysics_World *world); 35GuiLua *GuiLuaLoad(char *module, winFang *parent, EPhysics_World *world);
35void GuiLuaDel(GuiLua *gl); 36void GuiLuaDel(GuiLua *gl);
36 37
37#endif 38#endif