[Tux4kids-commits] r626 - in tuxmath/trunk: . src

[dbruce-guest at alioth.debian.org]

Author: dbruce-guest
Date: 2008-08-14 12:19:14 +0000 (Thu, 14 Aug 2008)
New Revision: 626

Modified:
   tuxmath/trunk/configure.ac
   tuxmath/trunk/src/game.c
   tuxmath/trunk/src/scandir.c
   tuxmath/trunk/src/titlescreen.c
Log:
added #include <stdlib.h> to scandir.c to try to fix BeOS build problem


Modified: tuxmath/trunk/configure.ac
===================================================================
--- tuxmath/trunk/configure.ac	2008-08-14 10:18:37 UTC (rev 625)
+++ tuxmath/trunk/configure.ac	2008-08-14 12:19:14 UTC (rev 626)
@@ -1,6 +1,6 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
-AC_INIT([Tux Of Math Command],[1.6.4],[tuxmath-devel at lists.sourceforge.net],[tuxmath])
+AC_INIT([Tux Of Math Command],[1.7.0],[tuxmath-devel at lists.sourceforge.net],[tuxmath])
 AC_CONFIG_SRCDIR([src/tuxmath.c])
 
 AC_PREREQ(2.61)

Modified: tuxmath/trunk/src/game.c
===================================================================
--- tuxmath/trunk/src/game.c	2008-08-14 10:18:37 UTC (rev 625)
+++ tuxmath/trunk/src/game.c	2008-08-14 12:19:14 UTC (rev 626)
@@ -2370,8 +2370,6 @@
   if (Opts_UseBkgd())
   {
     LoadBothBkgds(fname, &scaled_bkgd, &bkgd);
-//    bkgd = LoadBkgd(fname);
-//    bkgd = LoadBkgd("/home/dbruce/red_test.jpg");
     if (bkgd == NULL || scaled_bkgd == NULL)
     {
       fprintf(stderr,

Modified: tuxmath/trunk/src/scandir.c
===================================================================
--- tuxmath/trunk/src/scandir.c	2008-08-14 10:18:37 UTC (rev 625)
+++ tuxmath/trunk/src/scandir.c	2008-08-14 12:19:14 UTC (rev 626)
@@ -17,6 +17,7 @@
 */
 const char ScanDir_rcsid[] = "Hatari $Id: scandir.c,v 1.3 2007/01/16 18:42:59 thothy Exp $";
 
+#include <stdlib.h>
 #include <string.h>
 #include <strings.h>
 #include <stdio.h>

Modified: tuxmath/trunk/src/titlescreen.c
===================================================================
--- tuxmath/trunk/src/titlescreen.c	2008-08-14 10:18:37 UTC (rev 625)
+++ tuxmath/trunk/src/titlescreen.c	2008-08-14 12:19:14 UTC (rev 626)
@@ -135,7 +135,7 @@
          cursor,
          beak;
 
-/* The background image scaled to windowed 648x480 */
+/* The background image scaled to windowed 640x480 */
 SDL_Surface* bkg = NULL;
 /* The background image scaled to fullscreen dimensions */
 SDL_Surface* scaled_bkg = NULL;
@@ -143,7 +143,9 @@
 SDL_Surface* egg = NULL;
 int egg_active = 0; //are we currently using the egg cursor?
 
+
 SDL_Surface* current_bkg()
+  /* This syntax makes my brain start to explode! */
   { return screen->flags & SDL_FULLSCREEN ? scaled_bkg : bkg; }
 
 /* Local function prototypes: */