[Tux4kids-commits] r1304 - branches/commonification/tuxmath/trunk/src

[Bolesław Kulbabiński]

Author: bolekk-guest
Date: 2009-07-31 11:39:55 +0000 (Fri, 31 Jul 2009)
New Revision: 1304

Modified:
   branches/commonification/tuxmath/trunk/src/loaders.c
   branches/commonification/tuxmath/trunk/src/titlescreen.c
Log:
removed unnecessary dependencies from loaders.c

Modified: branches/commonification/tuxmath/trunk/src/loaders.c
===================================================================
--- branches/commonification/tuxmath/trunk/src/loaders.c	2009-07-31 11:31:31 UTC (rev 1303)
+++ branches/commonification/tuxmath/trunk/src/loaders.c	2009-07-31 11:39:55 UTC (rev 1304)
@@ -22,9 +22,6 @@
 */
 
 #include "loaders.h"
-#include "globals.h"
-#include "tuxmath.h"
-#include "setup.h"       // for cleanup_on_error()
 #include "SDL_extras.h"
 
 #ifdef HAVE_RSVG
@@ -366,7 +363,7 @@
     /* If image was required, exit from program: */
     fprintf(stderr, "load_image(): ERROR could not load required graphics file %s\n", file_name);
     fprintf(stderr, "%s", SDL_GetError() );
-    cleanup_on_error();
+    return NULL;
   }
   else if(!is_svg && w > 0 && h > 0)
   {

Modified: branches/commonification/tuxmath/trunk/src/titlescreen.c
===================================================================
--- branches/commonification/tuxmath/trunk/src/titlescreen.c	2009-07-31 11:31:31 UTC (rev 1303)
+++ branches/commonification/tuxmath/trunk/src/titlescreen.c	2009-07-31 11:39:55 UTC (rev 1304)
@@ -169,10 +169,11 @@
     /* Play "harp" greeting sound lifted from Tux Paint */
     playsound(SND_HARP);
     SDL_FreeSurface(logo);
-    /* load menus */
-    LoadMenus();
   }
 
+  /* load menus */
+  LoadMenus();
+
   /* load backgrounds */
   LoadBothBkgds(bkg_path, &fs_bkg, &win_bkg);
   if(fs_bkg == NULL || win_bkg == NULL)