diff options
author | David Walter Seikel | 2014-05-17 10:54:52 +1000 |
---|---|---|
committer | David Walter Seikel | 2014-05-17 10:54:52 +1000 |
commit | dcd11c8d2b399ce1309637bd756c680db0aec1af (patch) | |
tree | 79017fd75d8005bab37771d15612fde2215e72f0 /src/GuiLua/GuiLua.c | |
parent | Add a smarter server connect function. (diff) | |
download | SledjHamr-dcd11c8d2b399ce1309637bd756c680db0aec1af.zip SledjHamr-dcd11c8d2b399ce1309637bd756c680db0aec1af.tar.gz SledjHamr-dcd11c8d2b399ce1309637bd756c680db0aec1af.tar.bz2 SledjHamr-dcd11c8d2b399ce1309637bd756c680db0aec1af.tar.xz |
Use the new server connector, and some related movements.
Diffstat (limited to '')
-rw-r--r-- | src/GuiLua/GuiLua.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/GuiLua/GuiLua.c b/src/GuiLua/GuiLua.c index 92254ea..0fc27f4 100644 --- a/src/GuiLua/GuiLua.c +++ b/src/GuiLua/GuiLua.c | |||
@@ -371,7 +371,7 @@ PD("GuiLua 3"); | |||
371 | return 1; | 371 | return 1; |
372 | } | 372 | } |
373 | 373 | ||
374 | GuiLua *GuiLuaDo(int argc, char **argv, winFang *parent, Ecore_Con_Server *server, EPhysics_World *world) | 374 | GuiLua *GuiLuaDo(int argc, char **argv, winFang *parent, EPhysics_World *world) |
375 | { | 375 | { |
376 | GuiLua *result; | 376 | GuiLua *result; |
377 | lua_State *L; | 377 | lua_State *L; |
@@ -379,7 +379,6 @@ GuiLua *GuiLuaDo(int argc, char **argv, winFang *parent, Ecore_Con_Server *serve | |||
379 | 379 | ||
380 | result = calloc(1, sizeof(GuiLua)); | 380 | result = calloc(1, sizeof(GuiLua)); |
381 | result->parent = parent; | 381 | result->parent = parent; |
382 | result->server = server; | ||
383 | result->world = world; | 382 | result->world = world; |
384 | 383 | ||
385 | L = luaL_newstate(); | 384 | L = luaL_newstate(); |
@@ -434,13 +433,13 @@ GuiLua *GuiLuaDo(int argc, char **argv, winFang *parent, Ecore_Con_Server *serve | |||
434 | return result; | 433 | return result; |
435 | } | 434 | } |
436 | 435 | ||
437 | GuiLua *GuiLuaLoad(char *module, winFang *parent, Ecore_Con_Server *server, EPhysics_World *world) | 436 | GuiLua *GuiLuaLoad(char *module, winFang *parent, EPhysics_World *world) |
438 | { | 437 | { |
439 | GuiLua *result; | 438 | GuiLua *result; |
440 | char *args[] = {"GuiLUa", "-l", ""}; | 439 | char *args[] = {"GuiLUa", "-l", ""}; |
441 | 440 | ||
442 | args[2] = module; | 441 | args[2] = module; |
443 | result = GuiLuaDo(3, args, parent, server, world); | 442 | result = GuiLuaDo(3, args, parent, world); |
444 | result->name = module; | 443 | result->name = module; |
445 | return result; | 444 | return result; |
446 | } | 445 | } |