aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
authorDavid Walter Seikel2016-01-03 00:15:00 +1000
committerDavid Walter Seikel2016-01-03 00:15:00 +1000
commit02f15f0495565c474741cb719f3478f80b1f9e94 (patch)
tree0ea8008c21a99e0ce5e5a1488ecfa6dcb012a2c6 /src
parentLeft overs from previous commits. (diff)
downloadSledjHamr-02f15f0495565c474741cb719f3478f80b1f9e94.zip
SledjHamr-02f15f0495565c474741cb719f3478f80b1f9e94.tar.gz
SledjHamr-02f15f0495565c474741cb719f3478f80b1f9e94.tar.bz2
SledjHamr-02f15f0495565c474741cb719f3478f80b1f9e94.tar.xz
Stop the compile warnings, and clean out commented code.
Diffstat (limited to 'src')
-rw-r--r--src/extantz/extantz.c51
1 files changed, 6 insertions, 45 deletions
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)
541{ 541{
542 globals *ourGlobals = data; 542 globals *ourGlobals = data;
543 543
544 ecore_job_add(_makePhysics, ourGlobals); 544 ecore_job_add((Ecore_Cb) _makePhysics, ourGlobals);
545// ecore_timer_add(0.1, _makePhysics, ourGlobals); 545// ecore_timer_add(0.1, _makePhysics, ourGlobals);
546 546
547// ourGlobals->files = filesAdd(ourGlobals, (char *) prefix_data_get(), EINA_TRUE, EINA_FALSE); 547// ourGlobals->files = filesAdd(ourGlobals, (char *) prefix_data_get(), EINA_TRUE, EINA_FALSE);
@@ -553,7 +553,7 @@ static Eina_Bool _makeLove(void *data)
553{ 553{
554 globals *ourGlobals = data; 554 globals *ourGlobals = data;
555 555
556 ecore_job_add(_makeFiles, ourGlobals); 556 ecore_job_add((Ecore_Cb) _makeFiles, ourGlobals);
557// ecore_timer_add(0.1, _makeFiles, ourGlobals); 557// ecore_timer_add(0.1, _makeFiles, ourGlobals);
558 558
559 PD("About to try connecting to a love server."); 559 PD("About to try connecting to a love server.");
@@ -566,7 +566,7 @@ static Eina_Bool _makeMess(void *data)
566{ 566{
567 globals *ourGlobals = data; 567 globals *ourGlobals = data;
568 568
569 ecore_job_add(_makeLove, ourGlobals); 569 ecore_job_add((Ecore_Cb) _makeLove, ourGlobals);
570// ecore_timer_add(0.1, _makeLove, ourGlobals); 570// ecore_timer_add(0.1, _makeLove, ourGlobals);
571 571
572 ourGlobals->LSLGuiMess = GuiLuaLoad("LSLGuiMess", ourGlobals->mainWindow, ourGlobals->world); 572 ourGlobals->LSLGuiMess = GuiLuaLoad("LSLGuiMess", ourGlobals->mainWindow, ourGlobals->world);
@@ -579,7 +579,7 @@ static Eina_Bool _makeScenery(void *data)
579#if USE_EVAS_3D 579#if USE_EVAS_3D
580 globals *ourGlobals = data; 580 globals *ourGlobals = data;
581 581
582 ecore_job_add(_makeMess, ourGlobals); 582 ecore_job_add((Ecore_Cb) _makeMess, ourGlobals);
583// ecore_timer_add(0.1, _makeMess, ourGlobals); 583// ecore_timer_add(0.1, _makeMess, ourGlobals);
584 584
585 // Setup our Evas_3D stuff. 585 // Setup our Evas_3D stuff.
@@ -598,7 +598,7 @@ static Eina_Bool _makeMenus(void *data)
598{ 598{
599 globals *ourGlobals = data; 599 globals *ourGlobals = data;
600 600
601// ecore_job_add(_makeScenery, ourGlobals); 601// ecore_job_add((Ecore_Cb) _makeScenery, ourGlobals);
602 ecore_timer_add(0.5, _makeScenery, ourGlobals); 602 ecore_timer_add(0.5, _makeScenery, ourGlobals);
603 603
604 // Gotta do this after adding the windows, otherwise the menu renders under the window. 604 // Gotta do this after adding the windows, otherwise the menu renders under the window.
@@ -612,7 +612,7 @@ static Eina_Bool _makePurkle(void *data)
612{ 612{
613 globals *ourGlobals = data; 613 globals *ourGlobals = data;
614 614
615// ecore_job_add(_makeMenus, ourGlobals); 615// ecore_job_add((Ecore_Cb) _makeMenus, ourGlobals);
616 ecore_timer_add(1.0, _makeMenus, ourGlobals); 616 ecore_timer_add(1.0, _makeMenus, ourGlobals);
617 617
618 woMan_add(ourGlobals); 618 woMan_add(ourGlobals);
@@ -656,10 +656,6 @@ EAPI_MAIN int elm_main(int argc, char **argv)
656 elm_config_finger_size_set(0); 656 elm_config_finger_size_set(0);
657 elm_config_scale_set(1.0); 657 elm_config_scale_set(1.0);
658 658
659// JOB?
660// if (!ephysics_init())
661// return 1;
662
663 gld = &ourGlobals.gld; 659 gld = &ourGlobals.gld;
664 gldata_init(gld); 660 gldata_init(gld);
665 661
@@ -739,45 +735,10 @@ EAPI_MAIN int elm_main(int argc, char **argv)
739 735
740 init_evas_gl(&ourGlobals); 736 init_evas_gl(&ourGlobals);
741 737
742// JOB?
743#if USE_EVAS_3D
744 // Setup our Evas_3D stuff.
745// ourGlobals.scene = scenriAdd(ourGlobals.win);
746 // TODO - Just a temporary hack so Irrlicht and Evas_3D can share the camera move.
747// ourGlobals.gld.move = ourGlobals.scene->move;
748// evas_object_data_set(elm_image_object_get(ourGlobals.scene->image), "glob", &ourGlobals);
749// evas_object_image_pixels_get_callback_set(elm_image_object_get(ourGlobals.scene->image), on_pixels, &ourGlobals);
750// ourGlobals.scene->clickCb = _onWorldClick;
751#endif
752
753// JOB?
754// JOB?
755// if (!ephysics_init())
756// return 1;
757// ourGlobals.world = ephysicsAdd(&ourGlobals);
758
759// overlay_add(&ourGlobals);
760// GuiLuaLoad("test", ourGlobals.mainWindow, ourGlobals.world);
761
762// JOB?
763// woMan_add(&ourGlobals);
764// ourGlobals.purkle = GuiLuaLoad("purkle", ourGlobals.mainWindow, ourGlobals.world);
765// ourGlobals.LSLGuiMess = GuiLuaLoad("LSLGuiMess", ourGlobals.mainWindow, ourGlobals.world);
766// ourGlobals.files = filesAdd(&ourGlobals, (char *) prefix_data_get(), EINA_TRUE, EINA_FALSE);
767
768 // Gotta do this after adding the windows, otherwise the menu renders under the window.
769 // This sucks, gotta redefine this menu each time we create a new window?
770// _makeMainMenu(&ourGlobals);
771
772// JOB?
773// PD("About to try connecting to a love server.");
774// 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);
775 738
776 _on_resize(&ourGlobals, NULL, NULL, NULL); 739 _on_resize(&ourGlobals, NULL, NULL, NULL);
777// evas_object_show(ourGlobals.win);
778 740
779 // TODO - It's still very random if we got clouds straight away or not. B-( 741 // TODO - It's still very random if we got clouds straight away or not. B-(
780// ecore_job_add(_makePurkle, &ourGlobals);
781 ecore_timer_add(0.5, _makePurkle, &ourGlobals); 742 ecore_timer_add(0.5, _makePurkle, &ourGlobals);
782 743
783 elm_run(); 744 elm_run();