[Tux4kids-commits] r240 - in tuxtype/trunk: . tuxtype tuxtype/data/scripts
dbruce-guest at alioth.debian.org
dbruce-guest at alioth.debian.org
Sun Sep 16 00:41:02 UTC 2007
Author: dbruce-guest
Date: 2007-09-16 00:41:02 +0000 (Sun, 16 Sep 2007)
New Revision: 240
Modified:
tuxtype/trunk/ChangeLog
tuxtype/trunk/configure.ac
tuxtype/trunk/tuxtype/data/scripts/cascade.xml
tuxtype/trunk/tuxtype/data/scripts/laser.xml
tuxtype/trunk/tuxtype/data/scripts/projectInfo.xml
tuxtype/trunk/tuxtype/scripting.c
Log:
important bug fix in scripting.c that was keeping "Lessons" activity from working; minor fixes in xml script files.
Modified: tuxtype/trunk/ChangeLog
===================================================================
--- tuxtype/trunk/ChangeLog 2007-09-14 20:25:18 UTC (rev 239)
+++ tuxtype/trunk/ChangeLog 2007-09-16 00:41:02 UTC (rev 240)
@@ -1,3 +1,10 @@
+v 1.5.14 - svn revision 240
+15 Sep 2007
+[ David Bruce <dbruce at tampabay.rr.com> ]
+ - scripting.c - added UTF-8 to wchar_t conversion at needed point
+ when calling Phrases() (line ~1200).
+ - some corrections and editing of scripts projectInfo.xml, cascade.xml,
+ laser.xml - more work needed.
May-Sep 2007
Tux Type Indic Team:
Modified: tuxtype/trunk/configure.ac
===================================================================
--- tuxtype/trunk/configure.ac 2007-09-14 20:25:18 UTC (rev 239)
+++ tuxtype/trunk/configure.ac 2007-09-16 00:41:02 UTC (rev 240)
@@ -1,9 +1,9 @@
# Process this file with autoconf to produce a configure script.
-AC_INIT(tuxtype, 1.5.13, tuxmath-devel at lists.sourceforge.net)
+AC_INIT(tuxtype, 1.5.14, tuxmath-devel at lists.sourceforge.net)
AC_CANONICAL_HOST
AC_CANONICAL_TARGET
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(tuxtype, 1.5.13)
+AM_INIT_AUTOMAKE(tuxtype, 1.5.14)
AC_CONFIG_SRCDIR([tuxtype/funcs.h])
Modified: tuxtype/trunk/tuxtype/data/scripts/cascade.xml
===================================================================
--- tuxtype/trunk/tuxtype/data/scripts/cascade.xml 2007-09-14 20:25:18 UTC (rev 239)
+++ tuxtype/trunk/tuxtype/data/scripts/cascade.xml 2007-09-16 00:41:02 UTC (rev 240)
@@ -1,4 +1,4 @@
-<script title="Cascade Instructions">
+<script title="Fish Cascade Instructions">
<page>
<img src="lessons_bkg.png" x="0" y="0">
<img src="tutor-alpha.png" x="0" y="0">
Modified: tuxtype/trunk/tuxtype/data/scripts/laser.xml
===================================================================
--- tuxtype/trunk/tuxtype/data/scripts/laser.xml 2007-09-14 20:25:18 UTC (rev 239)
+++ tuxtype/trunk/tuxtype/data/scripts/laser.xml 2007-09-16 00:41:02 UTC (rev 240)
@@ -1,22 +1,22 @@
-<script title="Cascade Instructions" background="main_bkg.png">
+<script title="Comet Zap Instructions" background="main_bkg.jpg">
<page>
- <text align="center" size="32">Help Tux Eat Fish!</text>
+ <text align="center" size="28">Save The Cities From Falling Comets!</text>
<waitforinput/>
</page>
<page>
- <text align="center" size="32">Help Tux Eat Fish!</text>
+ <text align="center" size="28">Save The Cities From Falling Comets!</text>
<waitforinput/>
</page>
<page>
- <text align="center" size="32">Help Tux Eat Fish!</text>
+ <text align="center" size="28">Save The Cities From Falling Comets!</text>
<waitforinput/>
</page>
<page>
- <text align="center" size="32">Help Tux Eat Fish!</text>
+ <text align="center" size="28">Save The Cities From Falling Comets!</text>
<waitforinput/>
</page>
<page>
- <text align="center" size="32">Help Tux Eat Fish!</text>
+ <text align="center" size="28">Save The Cities From Falling Comets!</text>
<waitforinput/>
</page>
<page>
Modified: tuxtype/trunk/tuxtype/data/scripts/projectInfo.xml
===================================================================
--- tuxtype/trunk/tuxtype/data/scripts/projectInfo.xml 2007-09-14 20:25:18 UTC (rev 239)
+++ tuxtype/trunk/tuxtype/data/scripts/projectInfo.xml 2007-09-16 00:41:02 UTC (rev 240)
@@ -2,25 +2,26 @@
<page>
<img src="line2.png" x="5" y="0"></img>
<text size="6"></text>
- <text size="18" align="center" color="#000000">Tuxtype Project Information Center</text>
+ <text size="18" align="center" color="#000000">Tux Typing Project Information</text>
<text size="6" align="center"></text>
- <text size="14" align="center">Please visit one of the Tuxtype discussion forums at: </text>
- <text size="16" align="center">http://tuxtype.sf.net/forums</text>
- <text size="16" align="center">mailto://tuxtype-dev@tux4kids.net or irc://freenode/tuxtype</text>
+ <text size="14" align="center">Please visit one of the TuxType discussion forums at: </text>
+ <text size="16" align="center">http://tux4kids.alioth.debian.org</text>
+ <text size="16" align="center">mailto://tuxmath-devel@sourceforge.net or irc://freenode/tuxtype</text>
<text size="6" align="center"></text>
<text size="16" align="center">Tuxtype is brought to you by the good people of tux4kids. http://tux4kids.com</text>
<text size="6" align="center"></text>
- <text size="16" align="center">Our development Server is located at http://svn.tux4kids.net</text>
+ <text size="16" align="center">Our source code repository is located at http://svn.debian.org/wsvn/tux4kids/tuxtype/</text>
<text size="6" align="center"></text>
- <text size="16" align="center">Tutype was the brainchild of Sam Hart of the Univ of Arizona. It was then taken</text>
- <text size="16" align="center">over by Jesse D. Andrews, from of the Univ. of KY.</text>
- <text size="16" align="center">Many other people have contributed to Tuxtype please see the AUTHORS file.</text>
+ <text size="16" align="center">Tux Typing was the brainchild of Sam Hart, and was subsequently developed</text>
+ <text size="16" align="center">by Jesse D. Andrews. The current lead programmer is:</text>
+ <text size="16" align="center">David Bruce mailto://dbruce@tampabay.rr.com</text>
+ <text size="16" align="center">Please see the AUTHORS file for many others who have contributed significantly.</text>
<text size="4" align="center"></text>
<text size="32" align="center" color="#ff003f">BUGS:</text>
- <text size="16" align="center">Please report any bugs you find or any suggestions you have</text>
- <text size="16" align="center">to any of the discussion forums listed above.</text>
+ <text size="16" align="center">Please forward any bugs or suggestions</text>
+ <text size="16" align="center">to mailto://tuxmath-devel@sourceforge.net.</text>
<text size="4" align="center"></text>
- <text size="22" align="center" color="#ff7f3f">Tuxtype is GPL licensed Free software.</text>
+ <text size="22" align="center" color="#ff7f3f">Tuxtype is GPL licensed Free Software.</text>
<text size="22" align="center" color="#ff7f3f">Please see the COPYING file</text>
<text size="22" align="center" color="#000000">Hit SPACE to CONTINUE!!!</text>
<waitforinput/>
Modified: tuxtype/trunk/tuxtype/scripting.c
===================================================================
--- tuxtype/trunk/tuxtype/scripting.c 2007-09-14 20:25:18 UTC (rev 239)
+++ tuxtype/trunk/tuxtype/scripting.c 2007-09-16 00:41:02 UTC (rev 240)
@@ -38,29 +38,49 @@
void InstructCascade(void)
{
- char fn[FNLEN];
+ char fn[FNLEN];
- if (settings.use_english)
- sprintf( fn, "%s/scripts/cascade.xml", settings.default_data_path);
- else
+ /* Try theme script first: */
+ if (!settings.use_english)
sprintf( fn, "%s/scripts/cascade.xml", settings.theme_data_path);
+ if (load_script( fn ) == 0) /* meaning successful load */
+ {
+ run_script();
+ return;
+ }
+
+ /* If unsuccessful, fall back to default (English) script: */
+ sprintf( fn, "%s/scripts/cascade.xml", settings.default_data_path);
if (load_script( fn ) != 0)
return; // bail if any errors occur
+
run_script();
}
void InstructLaser(void)
{
+ char fn[FNLEN];
int i;
- char fn[FNLEN];
- if (settings.use_english)
- sprintf( fn, "%s/scripts/laser.xml", settings.default_data_path);
- else
+ /* Try theme script first: */
+ if (!settings.use_english)
sprintf( fn, "%s/scripts/laser.xml", settings.theme_data_path);
+ if (load_script( fn ) == 0) /* meaning successful load */
+ {
+ for (i = 0; i < 20; i++)
+ {
+ run_script();
+ SDL_Delay(500);
+ }
+ return;
+ }
+
+
+ /* If unsuccessful, fall back to default (English) script: */
+ sprintf( fn, "%s/scripts/laser.xml", settings.default_data_path);
if (load_script( fn ) != 0)
return; // bail if any errors occur
@@ -76,11 +96,18 @@
{
char fn[FNLEN];
- if (settings.use_english)
- sprintf( fn, "%s/scripts/projectInfo.xml", settings.default_data_path);
- else
+ /* Try theme script first: */
+ if (!settings.use_english)
sprintf( fn, "%s/scripts/projectInfo.xml", settings.theme_data_path);
+ if (load_script( fn ) == 0) /* meaning successful load */
+ {
+ run_script();
+ return;
+ }
+
+ /* If unsuccessful, fall back to default (English) script: */
+ sprintf( fn, "%s/scripts/projectInfo.xml", settings.default_data_path);
if (load_script( fn ) != 0)
return; // bail if any errors occur
@@ -457,11 +484,14 @@
char str[FNLEN];
FILE* f = NULL;
- LOG( "\nEnter load_script()\n" );
-
+ DEBUGCODE
+ {
+ fprintf(stderr, "\nEnter load_script() - attempt to load '%s'\n", fn);
+ }
+
if (curScript)
{
- LOG( "script already in memory, removing now!\n");
+ LOG( "previous script in memory, removing now!\n");
close_script();
}
More information about the Tux4kids-commits
mailing list