[Tux4kids-commits] r64 - in tuxmath/trunk: docs src

[dbruce at alioth.debian.org]

Author: dbruce
Date: 2006-12-02 00:28:17 +0000 (Sat, 02 Dec 2006)
New Revision: 64

Added:
   tuxmath/trunk/src/tuxmathrc.rc
Modified:
   tuxmath/trunk/docs/README.txt
   tuxmath/trunk/docs/TODO.txt
   tuxmath/trunk/docs/changelog
   tuxmath/trunk/src/Makefile.am
   tuxmath/trunk/src/fileops.c
   tuxmath/trunk/src/options.c
   tuxmath/trunk/src/options.h
Log:
menu overhaul in progress


Modified: tuxmath/trunk/docs/README.txt
===================================================================
--- tuxmath/trunk/docs/README.txt	2006-11-20 18:01:22 UTC (rev 63)
+++ tuxmath/trunk/docs/README.txt	2006-12-02 00:28:17 UTC (rev 64)
@@ -2,6 +2,13 @@
 An educational math tutorial game starring Tux, the Linux Penguin
 -----------------------------------------------------------------
 
+NOTE: Tuxmath is under heavy construction and currently does
+not compile - the menu system is being overhauled with code from
+tuxtype. Please checkout revision 61 if you need something
+that actually builds and works - i.e.:
+
+svn checkout -r 61 https://svn.tux4kids.net/tuxmath/
+
 Nov 18, 2006
 
 For tuxmath-1.0.1

Modified: tuxmath/trunk/docs/TODO.txt
===================================================================
--- tuxmath/trunk/docs/TODO.txt	2006-11-20 18:01:22 UTC (rev 63)
+++ tuxmath/trunk/docs/TODO.txt	2006-12-02 00:28:17 UTC (rev 64)
@@ -11,15 +11,16 @@
 Graphics:
   * Consider changing city graphics to something less violent.
   * Add more city graphic colors.
-  * Consider changing default resolution to 800x600.
+  * Consider changing default resolution to 800x600, maybe higher.
 
 Interface:
-  * Add more sound effects
+  * Add more sound effects and music files
   * Speech mode
   * Add option for number-keys to control main menu and possible options
     (for mouseless scenarios where arrow keys might not be the available...
     is there such a thing as numeric-only keyboards for PCs???)
-  * High-score table?
+  * High-score table
+  * Implement lockfile to prevent multiple invocations.
 
 Game Play:
   * More entertaining "victory" and "defeat" screens
@@ -34,7 +35,8 @@
   * Finish INSTALL.txt
 
 Options:
-  * Major overall of in-game Options system needed.
+  * Merge in code from TuxType for title screen and options system
+  * Make use of some of function keys(F1-F12) to toggle settings in-game
   * Display numbers instead of formulas if no operators are selected: "typing tutor" mode.
   * Save options.
   * Admin options screen / files

Modified: tuxmath/trunk/docs/changelog
===================================================================
--- tuxmath/trunk/docs/changelog	2006-11-20 18:01:22 UTC (rev 63)
+++ tuxmath/trunk/docs/changelog	2006-12-02 00:28:17 UTC (rev 64)
@@ -1,6 +1,12 @@
 changelog for "tuxmath"
 
+NOTE: Tuxmath is under heavy construction and currently does
+not compile - the menu system is being overhauled with code from
+tuxtype. Please checkout revision 61 if you need something
+that actually builds and works - i.e.:
 
+svn checkout -r 61 https://svn.tux4kids.net/tuxmath/
+
 2006.Nov.17  (https://svn.tux4kids.net/tuxmath/ - revision 61)
   Version 1.0.2
 

Modified: tuxmath/trunk/src/Makefile.am
===================================================================
--- tuxmath/trunk/src/Makefile.am	2006-11-20 18:01:22 UTC (rev 63)
+++ tuxmath/trunk/src/Makefile.am	2006-12-02 00:28:17 UTC (rev 64)
@@ -5,12 +5,14 @@
 bin_PROGRAMS = tuxmath
 endif
 
-TuxMath_SOURCES = tuxmath.c setup.c title.c game.c \
+TuxMath_SOURCES = tuxmath.c setup.c title.c titlescreen.c game.c \
 		options.c credits.c playsound.c \
+		theme.c loaders.c alphabet.c pause.c \
                 mathcards.c fileops.c tuxmathrc.c
 
-tuxmath_SOURCES = tuxmath.c setup.c title.c game.c \
+tuxmath_SOURCES = tuxmath.c setup.c title.c titlescreen.c game.c \
 		options.c credits.c playsound.c \
+		theme.c loaders.c alphabet.c pause.c \
                 mathcards.c fileops.c
 
 

Modified: tuxmath/trunk/src/fileops.c
===================================================================
--- tuxmath/trunk/src/fileops.c	2006-11-20 18:01:22 UTC (rev 63)
+++ tuxmath/trunk/src/fileops.c	2006-12-02 00:28:17 UTC (rev 64)
@@ -249,12 +249,12 @@
   }
   strcat(opt_path, filename); /* tack on filename              */
 
-  #ifdef TUXMATH_DEBUG
 
-
+  #ifdef TUXMATH_DEBUG
   printf("\nIn read_named_config_file() checking for %s (cwd)\n", opt_path);
   #endif
 
+
   fp = fopen(opt_path, "r");  /* try to open file */
   if (fp) /* file exists */
   {
@@ -962,8 +962,7 @@
 
   #ifdef TUXMATH_DEBUG
   printf("\nAfter file read in:\n");
-  print_game_options(stdout, 0);
-  MC_PrintMathOptions(stdout, 0);
+  write_config_file(stdout, 0);
   printf("Leaving read_config_file()\n");
   #endif
 

Modified: tuxmath/trunk/src/options.c
===================================================================
--- tuxmath/trunk/src/options.c	2006-11-20 18:01:22 UTC (rev 63)
+++ tuxmath/trunk/src/options.c	2006-12-02 00:28:17 UTC (rev 64)
@@ -51,7 +51,6 @@
 /*local function prototypes: */
 static void update_selected_option(int option);
 static int int_to_bool(int i);
-static void print_game_options(FILE* fp, int verbose);
 
 
 /* Main options() function - called from title(): */

Modified: tuxmath/trunk/src/options.h
===================================================================
--- tuxmath/trunk/src/options.h	2006-11-20 18:01:22 UTC (rev 63)
+++ tuxmath/trunk/src/options.h	2006-12-02 00:28:17 UTC (rev 64)
@@ -138,4 +138,9 @@
 int Opts_SoundHWAvailable(void);
 /* this is the function that says if sound is both desired and actually available: */
 int Opts_UsingSound(void);
+
+
+/* print options values to stream - for debugging purposes - has been */
+/* superceded by write_config_file() to actually write human-readable file. */
+void print_game_options(FILE* fp, int verbose);
 #endif

Added: tuxmath/trunk/src/tuxmathrc.rc
===================================================================
--- tuxmath/trunk/src/tuxmathrc.rc	2006-11-20 18:01:22 UTC (rev 63)
+++ tuxmath/trunk/src/tuxmathrc.rc	2006-12-02 00:28:17 UTC (rev 64)
@@ -0,0 +1,4 @@
+#define TUXMATH_ICON                       104
+TUXMATH_ICON			ICON "../data/images/tuxmath.ico"
+#define TUXMATH_ICON                       104
+TUXMATH_ICON			ICON "../data/images/tuxmath.ico"