[Tux4kids-commits] r1669 - in tuxtype/trunk: data/images src
David Bruce
dbruce-guest at alioth.debian.org
Tue Nov 24 15:47:16 UTC 2009
Author: dbruce-guest
Date: 2009-11-24 15:47:16 +0000 (Tue, 24 Nov 2009)
New Revision: 1669
Added:
tuxtype/trunk/data/images/kcas0.jpg
tuxtype/trunk/data/images/kcas1.jpg
tuxtype/trunk/data/images/kcas10.jpg
tuxtype/trunk/data/images/kcas11.jpg
tuxtype/trunk/data/images/kcas2.jpg
tuxtype/trunk/data/images/kcas3.jpg
tuxtype/trunk/data/images/kcas4.jpg
tuxtype/trunk/data/images/kcas5.jpg
tuxtype/trunk/data/images/kcas6.jpg
tuxtype/trunk/data/images/kcas7.jpg
tuxtype/trunk/data/images/kcas8.jpg
tuxtype/trunk/data/images/kcas9.jpg
Removed:
tuxtype/trunk/data/images/kcas1_1.jpg
tuxtype/trunk/data/images/kcas1_2.jpg
tuxtype/trunk/data/images/kcas1_3.jpg
tuxtype/trunk/data/images/kcas1_4.jpg
tuxtype/trunk/data/images/kcas2_1.jpg
tuxtype/trunk/data/images/kcas2_2.jpg
tuxtype/trunk/data/images/kcas2_3.jpg
tuxtype/trunk/data/images/kcas2_4.jpg
tuxtype/trunk/data/images/kcas3_1.jpg
tuxtype/trunk/data/images/kcas3_2.jpg
tuxtype/trunk/data/images/kcas3_3.jpg
tuxtype/trunk/data/images/kcas3_4.jpg
Modified:
tuxtype/trunk/data/images/Makefile.am
tuxtype/trunk/src/globals.h
tuxtype/trunk/src/playgame.c
tuxtype/trunk/src/titlescreen.c
Log:
Have fish cascade randomly choose from the 12 new backgrounds with each level
Modified: tuxtype/trunk/data/images/Makefile.am
===================================================================
--- tuxtype/trunk/data/images/Makefile.am 2009-11-23 04:56:22 UTC (rev 1668)
+++ tuxtype/trunk/data/images/Makefile.am 2009-11-24 15:47:16 UTC (rev 1669)
@@ -22,18 +22,18 @@
fishy3.png \
hidden.jpg \
insert1.png \
- kcas1_1.jpg \
- kcas1_2.jpg \
- kcas1_3.jpg \
- kcas1_4.jpg \
- kcas2_1.jpg \
- kcas2_2.jpg \
- kcas2_3.jpg \
- kcas2_4.jpg \
- kcas3_1.jpg \
- kcas3_2.jpg \
- kcas3_3.jpg \
- kcas3_4.jpg \
+ kcas0.jpg \
+ kcas1.jpg \
+ kcas2.jpg \
+ kcas3.jpg \
+ kcas4.jpg \
+ kcas5.jpg \
+ kcas6.jpg \
+ kcas7.jpg \
+ kcas8.jpg \
+ kcas9.jpg \
+ kcas10.jpg \
+ kcas11.jpg \
left.png \
line2.png \
main_bkg.png \
Copied: tuxtype/trunk/data/images/kcas0.jpg (from rev 1668, tuxtype/trunk/data/images/kcas1_1.jpg)
===================================================================
(Binary files differ)
Copied: tuxtype/trunk/data/images/kcas1.jpg (from rev 1668, tuxtype/trunk/data/images/kcas1_2.jpg)
===================================================================
(Binary files differ)
Copied: tuxtype/trunk/data/images/kcas10.jpg (from rev 1668, tuxtype/trunk/data/images/kcas3_3.jpg)
===================================================================
(Binary files differ)
Copied: tuxtype/trunk/data/images/kcas11.jpg (from rev 1668, tuxtype/trunk/data/images/kcas3_4.jpg)
===================================================================
(Binary files differ)
Deleted: tuxtype/trunk/data/images/kcas1_1.jpg
===================================================================
(Binary files differ)
Deleted: tuxtype/trunk/data/images/kcas1_2.jpg
===================================================================
(Binary files differ)
Deleted: tuxtype/trunk/data/images/kcas1_3.jpg
===================================================================
(Binary files differ)
Deleted: tuxtype/trunk/data/images/kcas1_4.jpg
===================================================================
(Binary files differ)
Copied: tuxtype/trunk/data/images/kcas2.jpg (from rev 1668, tuxtype/trunk/data/images/kcas1_3.jpg)
===================================================================
(Binary files differ)
Deleted: tuxtype/trunk/data/images/kcas2_1.jpg
===================================================================
(Binary files differ)
Deleted: tuxtype/trunk/data/images/kcas2_2.jpg
===================================================================
(Binary files differ)
Deleted: tuxtype/trunk/data/images/kcas2_3.jpg
===================================================================
(Binary files differ)
Deleted: tuxtype/trunk/data/images/kcas2_4.jpg
===================================================================
(Binary files differ)
Copied: tuxtype/trunk/data/images/kcas3.jpg (from rev 1668, tuxtype/trunk/data/images/kcas1_4.jpg)
===================================================================
(Binary files differ)
Deleted: tuxtype/trunk/data/images/kcas3_1.jpg
===================================================================
(Binary files differ)
Deleted: tuxtype/trunk/data/images/kcas3_2.jpg
===================================================================
(Binary files differ)
Deleted: tuxtype/trunk/data/images/kcas3_3.jpg
===================================================================
(Binary files differ)
Deleted: tuxtype/trunk/data/images/kcas3_4.jpg
===================================================================
(Binary files differ)
Copied: tuxtype/trunk/data/images/kcas4.jpg (from rev 1668, tuxtype/trunk/data/images/kcas2_1.jpg)
===================================================================
(Binary files differ)
Copied: tuxtype/trunk/data/images/kcas5.jpg (from rev 1668, tuxtype/trunk/data/images/kcas2_2.jpg)
===================================================================
(Binary files differ)
Copied: tuxtype/trunk/data/images/kcas6.jpg (from rev 1668, tuxtype/trunk/data/images/kcas2_3.jpg)
===================================================================
(Binary files differ)
Copied: tuxtype/trunk/data/images/kcas7.jpg (from rev 1668, tuxtype/trunk/data/images/kcas2_4.jpg)
===================================================================
(Binary files differ)
Copied: tuxtype/trunk/data/images/kcas8.jpg (from rev 1668, tuxtype/trunk/data/images/kcas3_1.jpg)
===================================================================
(Binary files differ)
Copied: tuxtype/trunk/data/images/kcas9.jpg (from rev 1668, tuxtype/trunk/data/images/kcas3_2.jpg)
===================================================================
(Binary files differ)
Modified: tuxtype/trunk/src/globals.h
===================================================================
--- tuxtype/trunk/src/globals.h 2009-11-23 04:56:22 UTC (rev 1668)
+++ tuxtype/trunk/src/globals.h 2009-11-24 15:47:16 UTC (rev 1669)
@@ -166,7 +166,7 @@
/* Limits on word list size, word length, and on the number of distinct characters */
/* that can be present within a word list: */
#define MAX_NUM_WORDS 500
-#define MAX_WORD_SIZE 20
+#define MAX_WORD_SIZE 30
#define MAX_WORD_LISTS 100
#define MAX_UNICODES 1024
Modified: tuxtype/trunk/src/playgame.c
===================================================================
--- tuxtype/trunk/src/playgame.c 2009-11-23 04:56:22 UTC (rev 1668)
+++ tuxtype/trunk/src/playgame.c 2009-11-24 15:47:16 UTC (rev 1669)
@@ -192,8 +192,9 @@
if (diflevel == INF_PRACT)
sprintf(filename, "pract.png");
else
- sprintf(filename, "kcas%i_%i.jpg", diflevel+1, curlevel+1);
-
+ {
+ sprintf(filename, "kcas%d.jpg", rand() % 12);
+ }
/* --- Special Hidden Code --- */
if (settings.hidden && curlevel == 3)
Modified: tuxtype/trunk/src/titlescreen.c
===================================================================
--- tuxtype/trunk/src/titlescreen.c 2009-11-23 04:56:22 UTC (rev 1668)
+++ tuxtype/trunk/src/titlescreen.c 2009-11-24 15:47:16 UTC (rev 1669)
@@ -1183,7 +1183,6 @@
-#define MAX_WORD_LISTS 100
/* returns 0 if user pressed escape ...
* 1 if word list was set correctly
More information about the Tux4kids-commits
mailing list