[Tux4kids-tuxtype-dev] Small Patches for tuxtype 1.5.17

[Lars Vogdt]

Hi

I'm currently packaging tuxtype (and tuxmath) for openSUSE in the 
openSUSE-Education repository at
http://download.opensuse.org/repositories/Education:/desktop/

I've compiled tuxtype 1.5.17 with gcc 4.3 and fixed the following small 
errors in the code:

Index: tuxtype_w_fonts-1.5.17/tuxtype/alphabet.c
===================================================================
--- tuxtype_w_fonts-1.5.17.orig/tuxtype/alphabet.c
+++ tuxtype_w_fonts-1.5.17/tuxtype/alphabet.c
@@ -212,14 +212,14 @@ int GetFinger(wchar_t uni_char)

   if (i == MAX_UNICODES)
   {
-    fprintf(stderr, "GetFinger() - Unicode char '%C' not found in list.
\n");
+    fprintf(stderr, "GetFinger() - Unicode char '%C' not found in list.
\n",uni_char);
     return -2;
   }

   if ((keyboard_list[i].finger < 0)
    || (keyboard_list[i].finger > 9))
   {
-    fprintf(stderr, "GetFinger() - Unicode char '%C' has no valid 
finger.\n");
+    fprintf(stderr, "GetFinger() - Unicode char '%C' has no valid 
finger.\n",uni_char);
     return -1;
   }

Index: tuxtype_w_fonts-1.5.17/tuxtype/scripting.c
===================================================================
--- tuxtype_w_fonts-1.5.17.orig/tuxtype/scripting.c
+++ tuxtype_w_fonts-1.5.17/tuxtype/scripting.c
@@ -380,7 +380,7 @@ int TestLesson(void)
   /* Getting to here means "stop == 1", try to run chosen script: */
   if (load_script(fn) != 0)
   {
-    fprintf(stderr, "load_script() failed to load '%s'\n");
+    fprintf(stderr, "load_script() failed to load '%s'\n",fn);
     return 0; // bail if any errors occur
   }

Index: tuxtype_w_fonts-1.5.17/tuxtype/laser.c
===================================================================
--- tuxtype_w_fonts-1.5.17.orig/tuxtype/laser.c
+++ tuxtype_w_fonts-1.5.17/tuxtype/laser.c
@@ -96,6 +96,7 @@ int PlayLaserGame(int diff_level)

    done = 0;
    quit = 0;
+   src.w = src.h = 0;

    /* Prepare to start the game: */

Would be great if you decide to include the patches in your next 
release.

Thanks and kind regards,
Lars


-- 
http://www.linux-schulserver.de/
GPG fingerprint = 430B 22B1 4491 0F0E 005A  8ADC BA18 E1B2 6539 BA0D
--------------------------------------------------------------------