[Tux4kids-commits] r235 - in tuxtype/trunk: . tuxtype

[dbruce-guest at alioth.debian.org]

Author: dbruce-guest
Date: 2007-09-09 00:59:31 +0000 (Sun, 09 Sep 2007)
New Revision: 235

Modified:
   tuxtype/trunk/ChangeLog
   tuxtype/trunk/tuxtype/alphabet.c
   tuxtype/trunk/tuxtype/playgame.c
Log:
corrected two very stupid mistakes in CheckNeededGlyphs() - I hope no one is swearing at me for yesterday's commit!


Modified: tuxtype/trunk/ChangeLog
===================================================================
--- tuxtype/trunk/ChangeLog	2007-09-08 19:03:47 UTC (rev 234)
+++ tuxtype/trunk/ChangeLog	2007-09-09 00:59:31 UTC (rev 235)
@@ -1,4 +1,21 @@
 v 1.5.13
+08 Sep 2007
+[ David Bruce <dbruce at tampabay.rr.com> ]
+       - more work on practice.c - nearly all strings changed to 
+         wchar_t arrays, should be able to support Unicode in
+         practice phrases.
+       - simplified format of keyboard.lst - each line now just
+         gives the fingering for a single character (e.g. "0|a").
+         The code to read in the keyboard.lst has been replaced.
+         All keyboard.lst files in the themes are updated to the
+         new format, however the Russian and Greek keyboard.lst files
+         are erroneous and prevent these themes from working.
+         TuxType now relies on the keyboard.lst files to tell it
+         what characters are permissible in the typing activities.
+         (If anyone knows of a cross-platform way to find out from
+         the OS what Unicode values are "typable" with the user's
+         current keyboard setup, please let me know!).
+
 03 Sep 2007
 [ David Bruce ]
        - practice.c revised significantly to prevent crashes if

Modified: tuxtype/trunk/tuxtype/alphabet.c
===================================================================
--- tuxtype/trunk/tuxtype/alphabet.c	2007-09-08 19:03:47 UTC (rev 234)
+++ tuxtype/trunk/tuxtype/alphabet.c	2007-09-09 00:59:31 UTC (rev 235)
@@ -906,9 +906,10 @@
       fprintf(stderr, "This probably means that the theme's 'keyboard.lst' file is incorrect or incomplete.\n");
       return 0;
     }
+    i++;
   }
   LOG("CheckNeededGlyphs() - all chars found.\n");
-  return 0;
+  return 1;
 }
 
 

Modified: tuxtype/trunk/tuxtype/playgame.c
===================================================================
--- tuxtype/trunk/tuxtype/playgame.c	2007-09-08 19:03:47 UTC (rev 234)
+++ tuxtype/trunk/tuxtype/playgame.c	2007-09-09 00:59:31 UTC (rev 235)
@@ -138,6 +138,7 @@
 	LoadFishies();
 	LoadOthers();
 	RenderLetters(font);
+	LOG( " Done rendering letters \n ");
 
 	/* Make sure everything in the word list is "typable" according to the current */
         /* theme's keyboard.lst:                                                       */