aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/src/extantz/extantz.c
diff options
context:
space:
mode:
authorDavid Walter Seikel2014-06-02 00:18:32 +1000
committerDavid Walter Seikel2014-06-02 00:18:32 +1000
commit923cdbef0a76190006a1a175b97836d0c3444214 (patch)
treede35b9975133929d30010b8deb18c5729d13264b /src/extantz/extantz.c
parentGet the from disk sim loading to work. (diff)
downloadSledjHamr-923cdbef0a76190006a1a175b97836d0c3444214.zip
SledjHamr-923cdbef0a76190006a1a175b97836d0c3444214.tar.gz
SledjHamr-923cdbef0a76190006a1a175b97836d0c3444214.tar.bz2
SledjHamr-923cdbef0a76190006a1a175b97836d0c3444214.tar.xz
Load and rez stuffs in an idler, also fix some bugs in that part.
Diffstat (limited to 'src/extantz/extantz.c')
-rw-r--r--src/extantz/extantz.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/extantz/extantz.c b/src/extantz/extantz.c
index e102165..7c90b8a 100644
--- a/src/extantz/extantz.c
+++ b/src/extantz/extantz.c
@@ -108,6 +108,7 @@ static Eina_Bool _data(void *data, int type, Ecore_Con_Event_Server_Data *ev)
108 // TODO - For now, assume it's a file:// URL. 108 // TODO - For now, assume it's a file:// URL.
109 t += 7; 109 t += 7;
110 //strcat(t, "/index.omg"); 110 //strcat(t, "/index.omg");
111 strcpy(ourGlobals->scene->sim, t);
111 PI("Loading local sim from %s", t); 112 PI("Loading local sim from %s", t);
112 113
113 // TODO - Later do the same with eet files in C code, but keep both implementations. 114 // TODO - Later do the same with eet files in C code, but keep both implementations.
@@ -118,8 +119,8 @@ static Eina_Bool _data(void *data, int type, Ecore_Con_Event_Server_Data *ev)
118 lua_remove(ourGlobals->scene->L, -2); // Removes "loaded" 119 lua_remove(ourGlobals->scene->L, -2); // Removes "loaded"
119 scenriLua = lua_gettop(ourGlobals->scene->L); 120 scenriLua = lua_gettop(ourGlobals->scene->L);
120 121
121 push_lua(ourGlobals->scene->L, "@ ( $ $ )", scenriLua, "loadSim", t); 122 push_lua(ourGlobals->scene->L, "@ ( $ )", scenriLua, "loadSim", t, 0);
122// Evas_3D_Demo_add(ourGlobals, t); 123 PI("Loaded local sim from %s", t);
123 } 124 }
124 else 125 else
125 { 126 {