Fix:cegui:Fixes ticket #61 : make cegui honour for ressources loading

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk/navit@705 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/src/gui/sdl/gui_sdl_window.cpp b/src/gui/sdl/gui_sdl_window.cpp
index 3ce45c7..b66a835 100644 (file)
--- a/src/gui/sdl/gui_sdl_window.cpp
+++ b/src/gui/sdl/gui_sdl_window.cpp
@@ -550,38 +550,18 @@ static void init_sdlgui(char * skin_layout,int fullscreen,int tilt)
                (System::getSingleton().getResourceProvider());
                
 
-               // FIXME This should maybe move to navit.xml
-               static char *datafiles_path[]={
-                       "./gui/sdl/datafiles",
-                       "/usr/share/navit/datafiles",
-                       "/usr/local/share/navit/datafiles",
-                       NULL,
-               };
-
-               char **filename=datafiles_path;
-
-               while (*filename) {     
-                       if (FILE * file = fopen(*filename, "r"))
-                       {
-                               fclose(file);
-                               break;
-                       }
-                       filename++;
-               }
-
-               if(*filename==NULL){
-                       // FIXME Elaborate the possible solutions
-                       printf("Can't find the datafiles directory for CEGUI files. Navit will probably crash :)\n");
-               } else {
-                       printf("Loading SDL datafiles from %s\n",*filename);
-               }
-
-               rp->setResourceGroupDirectory("schemes", g_strdup_printf("%s/schemes/",*filename));
-               rp->setResourceGroupDirectory("imagesets", g_strdup_printf("%s/imagesets/",*filename));
-               rp->setResourceGroupDirectory("fonts", g_strdup_printf("%s/fonts/",*filename));
-               rp->setResourceGroupDirectory("layouts", g_strdup_printf("%s/layouts/",*filename));
-               rp->setResourceGroupDirectory("looknfeels", g_strdup_printf("%s/looknfeel/",*filename));
-               rp->setResourceGroupDirectory("lua_scripts", g_strdup_printf("%s/lua_scripts/",*filename));
+               char *filename;
+
+               filename=g_strdup_printf("%s/share/navit/datafiles", getenv("NAVIT_PREFIX"));
+               dbg(0,"Loading SDL datafiles from %s\n",filename);
+
+               rp->setResourceGroupDirectory("schemes", g_strdup_printf("%s/schemes/",filename));
+               rp->setResourceGroupDirectory("imagesets", g_strdup_printf("%s/imagesets/",filename));
+               rp->setResourceGroupDirectory("fonts", g_strdup_printf("%s/fonts/",filename));
+               rp->setResourceGroupDirectory("layouts", g_strdup_printf("%s/layouts/",filename));
+               rp->setResourceGroupDirectory("looknfeels", g_strdup_printf("%s/looknfeel/",filename));
+               rp->setResourceGroupDirectory("lua_scripts", g_strdup_printf("%s/lua_scripts/",filename));
+               g_free(filename);
 
 
                CEGUI::Imageset::setDefaultResourceGroup("imagesets");