[Tux4kids-commits] r1532 - in tuxtype/trunk: data/images data/sounds doc src

[David Bruce]

Author: dbruce-guest
Date: 2009-09-12 13:49:14 +0000 (Sat, 12 Sep 2009)
New Revision: 1532

Modified:
   tuxtype/trunk/data/images/README_IMAGES.TXT
   tuxtype/trunk/data/sounds/Makefile.am
   tuxtype/trunk/doc/ChangeLog
   tuxtype/trunk/doc/TODO
   tuxtype/trunk/src/playgame.c
Log:
Update of media - now completely DFSG-compliant, no need for separate "tuxtype-data-nonfree" package.



Modified: tuxtype/trunk/data/images/README_IMAGES.TXT
===================================================================
--- tuxtype/trunk/data/images/README_IMAGES.TXT	2009-09-12 00:19:17 UTC (rev 1531)
+++ tuxtype/trunk/data/images/README_IMAGES.TXT	2009-09-12 13:49:14 UTC (rev 1532)
@@ -62,4 +62,3 @@
 are. But what's significant about it is that it's a special hidden
 background level. Simply use "tuxtype --hidden" to use it as the
 default background for level 4 on each difficulty level! Enjoy! ;)
-

Modified: tuxtype/trunk/data/sounds/Makefile.am
===================================================================
--- tuxtype/trunk/data/sounds/Makefile.am	2009-09-12 00:19:17 UTC (rev 1531)
+++ tuxtype/trunk/data/sounds/Makefile.am	2009-09-12 13:49:14 UTC (rev 1532)
@@ -9,6 +9,7 @@
   bite.wav \
   buzz.wav \
   cheer.wav \
+  chiptune2.ogg	\
   excuseme.wav \
   explosion.wav \
   harp.wav \

Modified: tuxtype/trunk/doc/ChangeLog
===================================================================
--- tuxtype/trunk/doc/ChangeLog	2009-09-12 00:19:17 UTC (rev 1531)
+++ tuxtype/trunk/doc/ChangeLog	2009-09-12 13:49:14 UTC (rev 1532)
@@ -1,3 +1,10 @@
+12 Sep 2009 (svn.debian.org/tux4kids - revision 1532) 
+[ David Bruce <davidstuartbruce at gmail.com> ]
+        - Media - new music files and backgrounds contributed by Caroline Ford,
+         some old sounds (the ones with suboptimal free licensing) removed - Tux
+         Typing is now 100% DFSG-compliant. Relevant Makefile.am's adapted.
+        - playgame.c adapted to use new music files.
+
 10 Sep 2009 (svn.debian.org/tux4kids - revision 1504) 
 [ Matthew Trey <tux4kids at treyhome.com> ]
         - Scripting - added code so the script parser recognizes comments in

Modified: tuxtype/trunk/doc/TODO
===================================================================
--- tuxtype/trunk/doc/TODO	2009-09-12 00:19:17 UTC (rev 1531)
+++ tuxtype/trunk/doc/TODO	2009-09-12 13:49:14 UTC (rev 1532)
@@ -17,10 +17,6 @@
 
 Apart from GSoC, both programs need ongoing code cleanup, especially tuxtype.  Also, tuxtype could benefit greatly at this point from a refresh of things other than the C code itself - high-resolution backgrounds, completion of rest of menu sprite icons, more word lists and phrase files, etc. 
 
--Replace the five remaining files which are non-free accoring to 
- Debians Free Software Guidelines with free ones. click.wav and
- kmus(1-4).wav are only free for non-commercial use.
-
 -check that SVN is free of generated files. create release-script, 
 
 

Modified: tuxtype/trunk/src/playgame.c
===================================================================
--- tuxtype/trunk/src/playgame.c	2009-09-12 00:19:17 UTC (rev 1531)
+++ tuxtype/trunk/src/playgame.c	2009-09-12 13:49:14 UTC (rev 1532)
@@ -212,8 +212,11 @@
 
       if (settings.sys_sound)
       {
+        //TODO make use of more music files
+        if(rand() % 2) 
           sprintf(filename, "amidst_the_raindrops.ogg");
-//        sprintf(filename, "kmus%i.wav", curlevel + 1);
+        else
+          sprintf(filename, "chiptune2.ogg");
         MusicLoad( filename, -1 );
       }