From 02f15f0495565c474741cb719f3478f80b1f9e94 Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Sun, 3 Jan 2016 00:15:00 +1000 Subject: Stop the compile warnings, and clean out commented code. --- src/extantz/extantz.c | 51 ++++++--------------------------------------------- 1 file changed, 6 insertions(+), 45 deletions(-) (limited to 'src/extantz') diff --git a/src/extantz/extantz.c b/src/extantz/extantz.c index 19432c6..d353b20 100644 --- a/src/extantz/extantz.c +++ b/src/extantz/extantz.c @@ -541,7 +541,7 @@ static Eina_Bool _makeFiles(void *data) { globals *ourGlobals = data; - ecore_job_add(_makePhysics, ourGlobals); + ecore_job_add((Ecore_Cb) _makePhysics, ourGlobals); // ecore_timer_add(0.1, _makePhysics, ourGlobals); // ourGlobals->files = filesAdd(ourGlobals, (char *) prefix_data_get(), EINA_TRUE, EINA_FALSE); @@ -553,7 +553,7 @@ static Eina_Bool _makeLove(void *data) { globals *ourGlobals = data; - ecore_job_add(_makeFiles, ourGlobals); + ecore_job_add((Ecore_Cb) _makeFiles, ourGlobals); // ecore_timer_add(0.1, _makeFiles, ourGlobals); PD("About to try connecting to a love server."); @@ -566,7 +566,7 @@ static Eina_Bool _makeMess(void *data) { globals *ourGlobals = data; - ecore_job_add(_makeLove, ourGlobals); + ecore_job_add((Ecore_Cb) _makeLove, ourGlobals); // ecore_timer_add(0.1, _makeLove, ourGlobals); ourGlobals->LSLGuiMess = GuiLuaLoad("LSLGuiMess", ourGlobals->mainWindow, ourGlobals->world); @@ -579,7 +579,7 @@ static Eina_Bool _makeScenery(void *data) #if USE_EVAS_3D globals *ourGlobals = data; - ecore_job_add(_makeMess, ourGlobals); + ecore_job_add((Ecore_Cb) _makeMess, ourGlobals); // ecore_timer_add(0.1, _makeMess, ourGlobals); // Setup our Evas_3D stuff. @@ -598,7 +598,7 @@ static Eina_Bool _makeMenus(void *data) { globals *ourGlobals = data; -// ecore_job_add(_makeScenery, ourGlobals); +// ecore_job_add((Ecore_Cb) _makeScenery, ourGlobals); ecore_timer_add(0.5, _makeScenery, ourGlobals); // Gotta do this after adding the windows, otherwise the menu renders under the window. @@ -612,7 +612,7 @@ static Eina_Bool _makePurkle(void *data) { globals *ourGlobals = data; -// ecore_job_add(_makeMenus, ourGlobals); +// ecore_job_add((Ecore_Cb) _makeMenus, ourGlobals); ecore_timer_add(1.0, _makeMenus, ourGlobals); woMan_add(ourGlobals); @@ -656,10 +656,6 @@ EAPI_MAIN int elm_main(int argc, char **argv) elm_config_finger_size_set(0); elm_config_scale_set(1.0); -// JOB? -// if (!ephysics_init()) -// return 1; - gld = &ourGlobals.gld; gldata_init(gld); @@ -739,45 +735,10 @@ EAPI_MAIN int elm_main(int argc, char **argv) init_evas_gl(&ourGlobals); -// JOB? -#if USE_EVAS_3D - // Setup our Evas_3D stuff. -// ourGlobals.scene = scenriAdd(ourGlobals.win); - // TODO - Just a temporary hack so Irrlicht and Evas_3D can share the camera move. -// ourGlobals.gld.move = ourGlobals.scene->move; -// evas_object_data_set(elm_image_object_get(ourGlobals.scene->image), "glob", &ourGlobals); -// evas_object_image_pixels_get_callback_set(elm_image_object_get(ourGlobals.scene->image), on_pixels, &ourGlobals); -// ourGlobals.scene->clickCb = _onWorldClick; -#endif - -// JOB? -// JOB? -// if (!ephysics_init()) -// return 1; -// ourGlobals.world = ephysicsAdd(&ourGlobals); - -// overlay_add(&ourGlobals); -// GuiLuaLoad("test", ourGlobals.mainWindow, ourGlobals.world); - -// JOB? -// woMan_add(&ourGlobals); -// ourGlobals.purkle = GuiLuaLoad("purkle", ourGlobals.mainWindow, ourGlobals.world); -// ourGlobals.LSLGuiMess = GuiLuaLoad("LSLGuiMess", ourGlobals.mainWindow, ourGlobals.world); -// ourGlobals.files = filesAdd(&ourGlobals, (char *) prefix_data_get(), EINA_TRUE, EINA_FALSE); - - // Gotta do this after adding the windows, otherwise the menu renders under the window. - // This sucks, gotta redefine this menu each time we create a new window? -// _makeMainMenu(&ourGlobals); - -// JOB? -// PD("About to try connecting to a love server."); -// reachOut("love", "./love", "127.0.0.1", 8211 + 1, &ourGlobals, (Ecore_Event_Handler_Cb) _add, /*(Ecore_Event_Handler_Cb) _data*/ NULL, (Ecore_Event_Handler_Cb) _del, clientParser); _on_resize(&ourGlobals, NULL, NULL, NULL); -// evas_object_show(ourGlobals.win); // TODO - It's still very random if we got clouds straight away or not. B-( -// ecore_job_add(_makePurkle, &ourGlobals); ecore_timer_add(0.5, _makePurkle, &ourGlobals); elm_run(); -- cgit v1.1