[Tux4kids-commits] r657 - in tuxtype/trunk: po src
dbruce-guest at alioth.debian.org
dbruce-guest at alioth.debian.org
Tue Aug 19 11:36:20 UTC 2008
Author: dbruce-guest
Date: 2008-08-19 11:36:20 +0000 (Tue, 19 Aug 2008)
New Revision: 657
Modified:
tuxtype/trunk/po/ar.po
tuxtype/trunk/po/ca.po
tuxtype/trunk/po/cs.po
tuxtype/trunk/po/da.po
tuxtype/trunk/po/de.po
tuxtype/trunk/po/el.po
tuxtype/trunk/po/en at boldquot.po
tuxtype/trunk/po/en at quot.po
tuxtype/trunk/po/en_GB.po
tuxtype/trunk/po/es.po
tuxtype/trunk/po/eu.po
tuxtype/trunk/po/fr.po
tuxtype/trunk/po/it.po
tuxtype/trunk/po/ja.po
tuxtype/trunk/po/lt.po
tuxtype/trunk/po/ml.gmo
tuxtype/trunk/po/ml.po
tuxtype/trunk/po/nb.po
tuxtype/trunk/po/ne.po
tuxtype/trunk/po/nl.po
tuxtype/trunk/po/nn.po
tuxtype/trunk/po/pt.po
tuxtype/trunk/po/ru.po
tuxtype/trunk/po/sv.po
tuxtype/trunk/po/sw.po
tuxtype/trunk/po/tuxtype.pot
tuxtype/trunk/po/wo.po
tuxtype/trunk/src/playgame.c
Log:
work on playgame.c to get new fullscreen working.
Modified: tuxtype/trunk/po/ar.po
===================================================================
--- tuxtype/trunk/po/ar.po 2008-08-19 08:16:56 UTC (rev 656)
+++ tuxtype/trunk/po/ar.po 2008-08-19 11:36:20 UTC (rev 657)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-18 15:29-0500\n"
+"POT-Creation-Date: 2008-08-18 21:04-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Mobin M <mobinmohan at gmail.com>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -40,41 +40,41 @@
msgid "Press space bar to return to game"
msgstr "Press space bar to return to game"
-#: src/playgame.c:947
+#: src/playgame.c:963
msgid "Level"
msgstr "A[qarh"
-#: src/playgame.c:948
+#: src/playgame.c:964
msgid "Lives"
msgstr "G3ank"
-#: src/playgame.c:949
+#: src/playgame.c:965
msgid "Fish"
msgstr "@ovg"
# levels for Cascade game:
-#: src/playgame.c:951 src/titlescreen.c:91
+#: src/playgame.c:967 src/titlescreen.c:91
msgid "Easy"
msgstr "Tanta."
-#: src/playgame.c:952 src/titlescreen.c:92
+#: src/playgame.c:968 src/titlescreen.c:92
msgid "Medium"
msgstr "Medium"
-#: src/playgame.c:953 src/titlescreen.c:93
+#: src/playgame.c:969 src/titlescreen.c:93
msgid "Hard"
msgstr "Hard"
# general stuff
-#: src/playgame.c:954 src/titlescreen.c:92
+#: src/playgame.c:970 src/titlescreen.c:92
msgid "Practice"
msgstr "Practice"
-#: src/playgame.c:965
+#: src/playgame.c:981
msgid "Congratulations"
msgstr "Congratulations"
-#: src/playgame.c:969
+#: src/playgame.c:985
msgid "Oh No!"
msgstr "Oh No!"
Modified: tuxtype/trunk/po/ca.po
===================================================================
--- tuxtype/trunk/po/ca.po 2008-08-19 08:16:56 UTC (rev 656)
+++ tuxtype/trunk/po/ca.po 2008-08-19 11:36:20 UTC (rev 657)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-18 15:29-0500\n"
+"POT-Creation-Date: 2008-08-18 21:04-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Mobin M <mobinmohan at gmail.com>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -42,41 +42,41 @@
msgid "Press space bar to return to game"
msgstr "Premeu 'espai' per tornar al joc"
-#: src/playgame.c:947
+#: src/playgame.c:963
msgid "Level"
msgstr "Nivell"
-#: src/playgame.c:948
+#: src/playgame.c:964
msgid "Lives"
msgstr "Vides"
-#: src/playgame.c:949
+#: src/playgame.c:965
msgid "Fish"
msgstr "Peix"
# levels for Cascade game:
-#: src/playgame.c:951 src/titlescreen.c:91
+#: src/playgame.c:967 src/titlescreen.c:91
msgid "Easy"
msgstr "Fàcil"
-#: src/playgame.c:952 src/titlescreen.c:92
+#: src/playgame.c:968 src/titlescreen.c:92
msgid "Medium"
msgstr "Mitg"
-#: src/playgame.c:953 src/titlescreen.c:93
+#: src/playgame.c:969 src/titlescreen.c:93
msgid "Hard"
msgstr "Difícil"
# general stuff
-#: src/playgame.c:954 src/titlescreen.c:92
+#: src/playgame.c:970 src/titlescreen.c:92
msgid "Practice"
msgstr "Practicar"
-#: src/playgame.c:965
+#: src/playgame.c:981
msgid "Congratulations"
msgstr "L'enhorabona!"
-#: src/playgame.c:969
+#: src/playgame.c:985
msgid "Oh No!"
msgstr "Oh No!"
Modified: tuxtype/trunk/po/cs.po
===================================================================
--- tuxtype/trunk/po/cs.po 2008-08-19 08:16:56 UTC (rev 656)
+++ tuxtype/trunk/po/cs.po 2008-08-19 11:36:20 UTC (rev 657)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-18 15:29-0500\n"
+"POT-Creation-Date: 2008-08-18 21:04-0500\n"
"PO-Revision-Date: 2007-11-10 16:36+0100\n"
"Last-Translator: JardaK <krejci at zstenis.com>\n"
"Language-Team: czech <cs at li.org>\n"
@@ -49,47 +49,47 @@
msgstr "Stiskni mezerník pro návrat do hry"
#
-#: src/playgame.c:947
+#: src/playgame.c:963
msgid "Level"
msgstr "Úroveň"
#
-#: src/playgame.c:948
+#: src/playgame.c:964
msgid "Lives"
msgstr "Životy"
#
-#: src/playgame.c:949
+#: src/playgame.c:965
msgid "Fish"
msgstr "Ryba"
#
-#: src/playgame.c:951 src/titlescreen.c:91
+#: src/playgame.c:967 src/titlescreen.c:91
msgid "Easy"
msgstr "Snadná"
#
-#: src/playgame.c:952 src/titlescreen.c:92
+#: src/playgame.c:968 src/titlescreen.c:92
msgid "Medium"
msgstr "Střední"
#
-#: src/playgame.c:953 src/titlescreen.c:93
+#: src/playgame.c:969 src/titlescreen.c:93
msgid "Hard"
msgstr "Těžká"
#
-#: src/playgame.c:954 src/titlescreen.c:92
+#: src/playgame.c:970 src/titlescreen.c:92
msgid "Practice"
msgstr "Procvičování"
#
-#: src/playgame.c:965
+#: src/playgame.c:981
msgid "Congratulations"
msgstr "Gratuluji"
#
-#: src/playgame.c:969
+#: src/playgame.c:985
msgid "Oh No!"
msgstr "Ach jo!"
Modified: tuxtype/trunk/po/da.po
===================================================================
--- tuxtype/trunk/po/da.po 2008-08-19 08:16:56 UTC (rev 656)
+++ tuxtype/trunk/po/da.po 2008-08-19 11:36:20 UTC (rev 657)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-18 15:29-0500\n"
+"POT-Creation-Date: 2008-08-18 21:04-0500\n"
"PO-Revision-Date: 2003-05-08 17:58+0200\n"
"Last-Translator: Nikolai Beier <beier at ofir.dk>\n"
"Language-Team: Danish\n"
@@ -40,41 +40,41 @@
msgid "Press space bar to return to game"
msgstr "Tryk på mellemrumstasten for at spille videre"
-#: src/playgame.c:947
+#: src/playgame.c:963
msgid "Level"
msgstr "Niveau"
-#: src/playgame.c:948
+#: src/playgame.c:964
msgid "Lives"
msgstr "Liv"
-#: src/playgame.c:949
+#: src/playgame.c:965
msgid "Fish"
msgstr "Fisk"
# levels for Cascade game:
-#: src/playgame.c:951 src/titlescreen.c:91
+#: src/playgame.c:967 src/titlescreen.c:91
msgid "Easy"
msgstr "Let"
-#: src/playgame.c:952 src/titlescreen.c:92
+#: src/playgame.c:968 src/titlescreen.c:92
msgid "Medium"
msgstr "Mellem"
-#: src/playgame.c:953 src/titlescreen.c:93
+#: src/playgame.c:969 src/titlescreen.c:93
msgid "Hard"
msgstr "Hård"
# general stuff
-#: src/playgame.c:954 src/titlescreen.c:92
+#: src/playgame.c:970 src/titlescreen.c:92
msgid "Practice"
msgstr "Øv dig!"
-#: src/playgame.c:965
+#: src/playgame.c:981
msgid "Congratulations"
msgstr "Tillykke!"
-#: src/playgame.c:969
+#: src/playgame.c:985
msgid "Oh No!"
msgstr "Åh nej!"
Modified: tuxtype/trunk/po/de.po
===================================================================
--- tuxtype/trunk/po/de.po 2008-08-19 08:16:56 UTC (rev 656)
+++ tuxtype/trunk/po/de.po 2008-08-19 11:36:20 UTC (rev 657)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-18 15:29-0500\n"
+"POT-Creation-Date: 2008-08-18 21:04-0500\n"
"PO-Revision-Date: 2003-06-14 19:00+0000\n"
"Last-Translator: Andreas Ramm <ace1 at gmx.net>\n"
"Language-Team: German\n"
@@ -40,41 +40,41 @@
msgid "Press space bar to return to game"
msgstr "Drücke die Leertaste um weiterzuspielen"
-#: src/playgame.c:947
+#: src/playgame.c:963
msgid "Level"
msgstr "Runde"
-#: src/playgame.c:948
+#: src/playgame.c:964
msgid "Lives"
msgstr "Leben"
-#: src/playgame.c:949
+#: src/playgame.c:965
msgid "Fish"
msgstr "Fisch"
# levels for Cascade game:
-#: src/playgame.c:951 src/titlescreen.c:91
+#: src/playgame.c:967 src/titlescreen.c:91
msgid "Easy"
msgstr "Einfach"
-#: src/playgame.c:952 src/titlescreen.c:92
+#: src/playgame.c:968 src/titlescreen.c:92
msgid "Medium"
msgstr "Mittel"
-#: src/playgame.c:953 src/titlescreen.c:93
+#: src/playgame.c:969 src/titlescreen.c:93
msgid "Hard"
msgstr "Schwer"
# general stuff
-#: src/playgame.c:954 src/titlescreen.c:92
+#: src/playgame.c:970 src/titlescreen.c:92
msgid "Practice"
msgstr "Fingerübung"
-#: src/playgame.c:965
+#: src/playgame.c:981
msgid "Congratulations"
msgstr "Herzlichen Glückwunsch!"
-#: src/playgame.c:969
+#: src/playgame.c:985
msgid "Oh No!"
msgstr "Oh Nein!"
Modified: tuxtype/trunk/po/el.po
===================================================================
--- tuxtype/trunk/po/el.po 2008-08-19 08:16:56 UTC (rev 656)
+++ tuxtype/trunk/po/el.po 2008-08-19 11:36:20 UTC (rev 657)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-18 15:29-0500\n"
+"POT-Creation-Date: 2008-08-18 21:04-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -40,41 +40,41 @@
msgid "Press space bar to return to game"
msgstr "Πάτα το κενό για να γυρίσεις στο παιχνίδι"
-#: src/playgame.c:947
+#: src/playgame.c:963
msgid "Level"
msgstr "Επίπεδο"
-#: src/playgame.c:948
+#: src/playgame.c:964
msgid "Lives"
msgstr "Ζωές"
-#: src/playgame.c:949
+#: src/playgame.c:965
msgid "Fish"
msgstr "Ψάρια"
# levels for Cascade game:
-#: src/playgame.c:951 src/titlescreen.c:91
+#: src/playgame.c:967 src/titlescreen.c:91
msgid "Easy"
msgstr "1. Εύκολο"
-#: src/playgame.c:952 src/titlescreen.c:92
+#: src/playgame.c:968 src/titlescreen.c:92
msgid "Medium"
msgstr "2. Κανονικό"
-#: src/playgame.c:953 src/titlescreen.c:93
+#: src/playgame.c:969 src/titlescreen.c:93
msgid "Hard"
msgstr "3. Δύσκολο"
# general stuff
-#: src/playgame.c:954 src/titlescreen.c:92
+#: src/playgame.c:970 src/titlescreen.c:92
msgid "Practice"
msgstr "Εξάσκηση"
-#: src/playgame.c:965
+#: src/playgame.c:981
msgid "Congratulations"
msgstr "Συγχαρητήρια"
-#: src/playgame.c:969
+#: src/playgame.c:985
msgid "Oh No!"
msgstr "Ωχ! Όχι"
Modified: tuxtype/trunk/po/en at boldquot.po
===================================================================
--- tuxtype/trunk/po/en at boldquot.po 2008-08-19 08:16:56 UTC (rev 656)
+++ tuxtype/trunk/po/en at boldquot.po 2008-08-19 11:36:20 UTC (rev 657)
@@ -31,8 +31,8 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-18 15:29-0500\n"
-"PO-Revision-Date: 2008-08-18 15:29-0500\n"
+"POT-Creation-Date: 2008-08-18 21:04-0500\n"
+"PO-Revision-Date: 2008-08-18 21:04-0500\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
@@ -64,39 +64,39 @@
msgid "Press space bar to return to game"
msgstr "Press space bar to return to game"
-#: src/playgame.c:947
+#: src/playgame.c:963
msgid "Level"
msgstr "Level"
-#: src/playgame.c:948
+#: src/playgame.c:964
msgid "Lives"
msgstr "Lives"
-#: src/playgame.c:949
+#: src/playgame.c:965
msgid "Fish"
msgstr "Fish"
-#: src/playgame.c:951 src/titlescreen.c:91
+#: src/playgame.c:967 src/titlescreen.c:91
msgid "Easy"
msgstr "Easy"
-#: src/playgame.c:952 src/titlescreen.c:92
+#: src/playgame.c:968 src/titlescreen.c:92
msgid "Medium"
msgstr "Medium"
-#: src/playgame.c:953 src/titlescreen.c:93
+#: src/playgame.c:969 src/titlescreen.c:93
msgid "Hard"
msgstr "Hard"
-#: src/playgame.c:954 src/titlescreen.c:92
+#: src/playgame.c:970 src/titlescreen.c:92
msgid "Practice"
msgstr "Practice"
-#: src/playgame.c:965
+#: src/playgame.c:981
msgid "Congratulations"
msgstr "Congratulations"
-#: src/playgame.c:969
+#: src/playgame.c:985
msgid "Oh No!"
msgstr "Oh No!"
Modified: tuxtype/trunk/po/en at quot.po
===================================================================
--- tuxtype/trunk/po/en at quot.po 2008-08-19 08:16:56 UTC (rev 656)
+++ tuxtype/trunk/po/en at quot.po 2008-08-19 11:36:20 UTC (rev 657)
@@ -28,8 +28,8 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-18 15:29-0500\n"
-"PO-Revision-Date: 2008-08-18 15:29-0500\n"
+"POT-Creation-Date: 2008-08-18 21:04-0500\n"
+"PO-Revision-Date: 2008-08-18 21:04-0500\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
@@ -61,39 +61,39 @@
msgid "Press space bar to return to game"
msgstr "Press space bar to return to game"
-#: src/playgame.c:947
+#: src/playgame.c:963
msgid "Level"
msgstr "Level"
-#: src/playgame.c:948
+#: src/playgame.c:964
msgid "Lives"
msgstr "Lives"
-#: src/playgame.c:949
+#: src/playgame.c:965
msgid "Fish"
msgstr "Fish"
-#: src/playgame.c:951 src/titlescreen.c:91
+#: src/playgame.c:967 src/titlescreen.c:91
msgid "Easy"
msgstr "Easy"
-#: src/playgame.c:952 src/titlescreen.c:92
+#: src/playgame.c:968 src/titlescreen.c:92
msgid "Medium"
msgstr "Medium"
-#: src/playgame.c:953 src/titlescreen.c:93
+#: src/playgame.c:969 src/titlescreen.c:93
msgid "Hard"
msgstr "Hard"
-#: src/playgame.c:954 src/titlescreen.c:92
+#: src/playgame.c:970 src/titlescreen.c:92
msgid "Practice"
msgstr "Practice"
-#: src/playgame.c:965
+#: src/playgame.c:981
msgid "Congratulations"
msgstr "Congratulations"
-#: src/playgame.c:969
+#: src/playgame.c:985
msgid "Oh No!"
msgstr "Oh No!"
Modified: tuxtype/trunk/po/en_GB.po
===================================================================
--- tuxtype/trunk/po/en_GB.po 2008-08-19 08:16:56 UTC (rev 656)
+++ tuxtype/trunk/po/en_GB.po 2008-08-19 11:36:20 UTC (rev 657)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Tuxtype\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-18 15:29-0500\n"
+"POT-Creation-Date: 2008-08-18 21:04-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Mobin M <mobinmohan at gmail.com>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -40,39 +40,39 @@
msgid "Press space bar to return to game"
msgstr ""
-#: src/playgame.c:947
+#: src/playgame.c:963
msgid "Level"
msgstr ""
-#: src/playgame.c:948
+#: src/playgame.c:964
msgid "Lives"
msgstr ""
-#: src/playgame.c:949
+#: src/playgame.c:965
msgid "Fish"
msgstr ""
-#: src/playgame.c:951 src/titlescreen.c:91
+#: src/playgame.c:967 src/titlescreen.c:91
msgid "Easy"
msgstr ""
-#: src/playgame.c:952 src/titlescreen.c:92
+#: src/playgame.c:968 src/titlescreen.c:92
msgid "Medium"
msgstr ""
-#: src/playgame.c:953 src/titlescreen.c:93
+#: src/playgame.c:969 src/titlescreen.c:93
msgid "Hard"
msgstr ""
-#: src/playgame.c:954 src/titlescreen.c:92
+#: src/playgame.c:970 src/titlescreen.c:92
msgid "Practice"
msgstr ""
-#: src/playgame.c:965
+#: src/playgame.c:981
msgid "Congratulations"
msgstr ""
-#: src/playgame.c:969
+#: src/playgame.c:985
msgid "Oh No!"
msgstr ""
Modified: tuxtype/trunk/po/es.po
===================================================================
--- tuxtype/trunk/po/es.po 2008-08-19 08:16:56 UTC (rev 656)
+++ tuxtype/trunk/po/es.po 2008-08-19 11:36:20 UTC (rev 657)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-18 15:29-0500\n"
+"POT-Creation-Date: 2008-08-18 21:04-0500\n"
"PO-Revision-Date: 2007-09-16 19:00+0000\n"
"Last-Translator: Amaya Rodrigo <amaya at debian.org>\n"
"Language-Team: Spanish\n"
@@ -39,41 +39,41 @@
msgid "Press space bar to return to game"
msgstr "Pulsa la barra espaciadora para regresar al juego"
-#: src/playgame.c:947
+#: src/playgame.c:963
msgid "Level"
msgstr "Nivel"
-#: src/playgame.c:948
+#: src/playgame.c:964
msgid "Lives"
msgstr "Vidas"
-#: src/playgame.c:949
+#: src/playgame.c:965
msgid "Fish"
msgstr "Pescado"
# niveles para juego de cascada:
-#: src/playgame.c:951 src/titlescreen.c:91
+#: src/playgame.c:967 src/titlescreen.c:91
msgid "Easy"
msgstr "Fácil"
-#: src/playgame.c:952 src/titlescreen.c:92
+#: src/playgame.c:968 src/titlescreen.c:92
msgid "Medium"
msgstr "Medio"
-#: src/playgame.c:953 src/titlescreen.c:93
+#: src/playgame.c:969 src/titlescreen.c:93
msgid "Hard"
msgstr "Difícil"
# Cosas generales
-#: src/playgame.c:954 src/titlescreen.c:92
+#: src/playgame.c:970 src/titlescreen.c:92
msgid "Practice"
msgstr "Practicar"
-#: src/playgame.c:965
+#: src/playgame.c:981
msgid "Congratulations"
msgstr "¡Felicidades!"
-#: src/playgame.c:969
+#: src/playgame.c:985
msgid "Oh No!"
msgstr "¡Oh, no!"
Modified: tuxtype/trunk/po/eu.po
===================================================================
--- tuxtype/trunk/po/eu.po 2008-08-19 08:16:56 UTC (rev 656)
+++ tuxtype/trunk/po/eu.po 2008-08-19 11:36:20 UTC (rev 657)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-18 15:29-0500\n"
+"POT-Creation-Date: 2008-08-18 21:04-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -40,41 +40,41 @@
msgid "Press space bar to return to game"
msgstr "Sakatu berriz bitarte-barra jokora itzultzeko"
-#: src/playgame.c:947
+#: src/playgame.c:963
msgid "Level"
msgstr "Maila"
-#: src/playgame.c:948
+#: src/playgame.c:964
msgid "Lives"
msgstr "Bizitzak"
-#: src/playgame.c:949
+#: src/playgame.c:965
msgid "Fish"
msgstr "Arraina"
# levels for Cascade game:
-#: src/playgame.c:951 src/titlescreen.c:91
+#: src/playgame.c:967 src/titlescreen.c:91
msgid "Easy"
msgstr "Erreza"
-#: src/playgame.c:952 src/titlescreen.c:92
+#: src/playgame.c:968 src/titlescreen.c:92
msgid "Medium"
msgstr "Ertaina"
-#: src/playgame.c:953 src/titlescreen.c:93
+#: src/playgame.c:969 src/titlescreen.c:93
msgid "Hard"
msgstr "Gaitza"
# general stuff
-#: src/playgame.c:954 src/titlescreen.c:92
+#: src/playgame.c:970 src/titlescreen.c:92
msgid "Practice"
msgstr "Trebakuntza"
-#: src/playgame.c:965
+#: src/playgame.c:981
msgid "Congratulations"
msgstr "Zorionak"
-#: src/playgame.c:969
+#: src/playgame.c:985
msgid "Oh No!"
msgstr "Oi ez!"
Modified: tuxtype/trunk/po/fr.po
===================================================================
--- tuxtype/trunk/po/fr.po 2008-08-19 08:16:56 UTC (rev 656)
+++ tuxtype/trunk/po/fr.po 2008-08-19 11:36:20 UTC (rev 657)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-18 15:29-0500\n"
+"POT-Creation-Date: 2008-08-18 21:04-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -42,41 +42,41 @@
msgid "Press space bar to return to game"
msgstr "taper la touche espace pour jouer"
-#: src/playgame.c:947
+#: src/playgame.c:963
msgid "Level"
msgstr "Niveau"
-#: src/playgame.c:948
+#: src/playgame.c:964
msgid "Lives"
msgstr "Vies"
-#: src/playgame.c:949
+#: src/playgame.c:965
msgid "Fish"
msgstr "Poissons"
# levels for Cascade game:
-#: src/playgame.c:951 src/titlescreen.c:91
+#: src/playgame.c:967 src/titlescreen.c:91
msgid "Easy"
msgstr "Facile"
-#: src/playgame.c:952 src/titlescreen.c:92
+#: src/playgame.c:968 src/titlescreen.c:92
msgid "Medium"
msgstr "Moyen"
-#: src/playgame.c:953 src/titlescreen.c:93
+#: src/playgame.c:969 src/titlescreen.c:93
msgid "Hard"
msgstr "Fort"
# general stuff
-#: src/playgame.c:954 src/titlescreen.c:92
+#: src/playgame.c:970 src/titlescreen.c:92
msgid "Practice"
msgstr "Pratique"
-#: src/playgame.c:965
+#: src/playgame.c:981
msgid "Congratulations"
msgstr "Flicitations"
-#: src/playgame.c:969
+#: src/playgame.c:985
msgid "Oh No!"
msgstr "Oh Non!"
Modified: tuxtype/trunk/po/it.po
===================================================================
--- tuxtype/trunk/po/it.po 2008-08-19 08:16:56 UTC (rev 656)
+++ tuxtype/trunk/po/it.po 2008-08-19 11:36:20 UTC (rev 657)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-18 15:29-0500\n"
+"POT-Creation-Date: 2008-08-18 21:04-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -40,41 +40,41 @@
msgid "Press space bar to return to game"
msgstr "premi SPAZIO per ritornare al gioco"
-#: src/playgame.c:947
+#: src/playgame.c:963
msgid "Level"
msgstr "Livello"
-#: src/playgame.c:948
+#: src/playgame.c:964
msgid "Lives"
msgstr "Vite"
-#: src/playgame.c:949
+#: src/playgame.c:965
msgid "Fish"
msgstr "Pesci"
# levels for Cascade game:
-#: src/playgame.c:951 src/titlescreen.c:91
+#: src/playgame.c:967 src/titlescreen.c:91
msgid "Easy"
msgstr "Facile"
-#: src/playgame.c:952 src/titlescreen.c:92
+#: src/playgame.c:968 src/titlescreen.c:92
msgid "Medium"
msgstr "Medio"
-#: src/playgame.c:953 src/titlescreen.c:93
+#: src/playgame.c:969 src/titlescreen.c:93
msgid "Hard"
msgstr "Difficile"
# general stuff
-#: src/playgame.c:954 src/titlescreen.c:92
+#: src/playgame.c:970 src/titlescreen.c:92
msgid "Practice"
msgstr "Pratica"
-#: src/playgame.c:965
+#: src/playgame.c:981
msgid "Congratulations"
msgstr "Congratulazioni"
-#: src/playgame.c:969
+#: src/playgame.c:985
msgid "Oh No!"
msgstr "Oh No! Prova di nuovo..."
Modified: tuxtype/trunk/po/ja.po
===================================================================
--- tuxtype/trunk/po/ja.po 2008-08-19 08:16:56 UTC (rev 656)
+++ tuxtype/trunk/po/ja.po 2008-08-19 11:36:20 UTC (rev 657)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-18 15:29-0500\n"
+"POT-Creation-Date: 2008-08-18 21:04-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -39,39 +39,39 @@
msgid "Press space bar to return to game"
msgstr ""
-#: src/playgame.c:947
+#: src/playgame.c:963
msgid "Level"
msgstr ""
-#: src/playgame.c:948
+#: src/playgame.c:964
msgid "Lives"
msgstr ""
-#: src/playgame.c:949
+#: src/playgame.c:965
msgid "Fish"
msgstr ""
-#: src/playgame.c:951 src/titlescreen.c:91
+#: src/playgame.c:967 src/titlescreen.c:91
msgid "Easy"
msgstr ""
-#: src/playgame.c:952 src/titlescreen.c:92
+#: src/playgame.c:968 src/titlescreen.c:92
msgid "Medium"
msgstr ""
-#: src/playgame.c:953 src/titlescreen.c:93
+#: src/playgame.c:969 src/titlescreen.c:93
msgid "Hard"
msgstr ""
-#: src/playgame.c:954 src/titlescreen.c:92
+#: src/playgame.c:970 src/titlescreen.c:92
msgid "Practice"
msgstr ""
-#: src/playgame.c:965
+#: src/playgame.c:981
msgid "Congratulations"
msgstr ""
-#: src/playgame.c:969
+#: src/playgame.c:985
msgid "Oh No!"
msgstr ""
Modified: tuxtype/trunk/po/lt.po
===================================================================
--- tuxtype/trunk/po/lt.po 2008-08-19 08:16:56 UTC (rev 656)
+++ tuxtype/trunk/po/lt.po 2008-08-19 11:36:20 UTC (rev 657)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-18 15:29-0500\n"
+"POT-Creation-Date: 2008-08-18 21:04-0500\n"
"PO-Revision-Date: 2004-10-20\n"
"Last-Translator: Gintautas Grigas <grigas at ktl.mii.lt>\n"
"Language-Team: Lithuanian\n"
@@ -40,41 +40,41 @@
msgid "Press space bar to return to game"
msgstr "Jei norite grįžti į žaidimą, paspauskite tarpo klavišą"
-#: src/playgame.c:947
+#: src/playgame.c:963
msgid "Level"
msgstr "lygis"
-#: src/playgame.c:948
+#: src/playgame.c:964
msgid "Lives"
msgstr "Meškerių:"
-#: src/playgame.c:949
+#: src/playgame.c:965
msgid "Fish"
msgstr "Žuvų:"
# levels for Cascade game:
-#: src/playgame.c:951 src/titlescreen.c:91
+#: src/playgame.c:967 src/titlescreen.c:91
msgid "Easy"
msgstr "Lengvas"
-#: src/playgame.c:952 src/titlescreen.c:92
+#: src/playgame.c:968 src/titlescreen.c:92
msgid "Medium"
msgstr "Vidutinis"
-#: src/playgame.c:953 src/titlescreen.c:93
+#: src/playgame.c:969 src/titlescreen.c:93
msgid "Hard"
msgstr "Sunkus"
# general stuff
-#: src/playgame.c:954 src/titlescreen.c:92
+#: src/playgame.c:970 src/titlescreen.c:92
msgid "Practice"
msgstr "Pirštų pratimai"
-#: src/playgame.c:965
+#: src/playgame.c:981
msgid "Congratulations"
msgstr "Sveikiname!"
-#: src/playgame.c:969
+#: src/playgame.c:985
msgid "Oh No!"
msgstr "Deja..."
Modified: tuxtype/trunk/po/ml.gmo
===================================================================
(Binary files differ)
Modified: tuxtype/trunk/po/ml.po
===================================================================
--- tuxtype/trunk/po/ml.po 2008-08-19 08:16:56 UTC (rev 656)
+++ tuxtype/trunk/po/ml.po 2008-08-19 11:36:20 UTC (rev 657)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Tuxtype\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-18 15:29-0500\n"
+"POT-Creation-Date: 2008-08-18 21:04-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Mobin M <mobinmohan at gmail.com>\n"
"Language-Team: Swathanthra|സ്വതന്ത്ര Malayalam|മലയാളം Computing|കമ്പ്യൂട്ടിങ്ങ് <smc-"
@@ -41,39 +41,39 @@
msgid "Press space bar to return to game"
msgstr "കളിയില് തിരിച്ചെത്താന് സ്പെയ്സ് കീ അടിക്കുക"
-#: src/playgame.c:947
+#: src/playgame.c:963
msgid "Level"
msgstr "തട്ട്"
-#: src/playgame.c:948
+#: src/playgame.c:964
msgid "Lives"
msgstr "ആയുസ്സ്"
-#: src/playgame.c:949
+#: src/playgame.c:965
msgid "Fish"
msgstr "മത്സ്യം"
-#: src/playgame.c:951 src/titlescreen.c:91
+#: src/playgame.c:967 src/titlescreen.c:91
msgid "Easy"
msgstr "എളുപ്പം"
-#: src/playgame.c:952 src/titlescreen.c:92
+#: src/playgame.c:968 src/titlescreen.c:92
msgid "Medium"
msgstr "ഇടത്തരം"
-#: src/playgame.c:953 src/titlescreen.c:93
+#: src/playgame.c:969 src/titlescreen.c:93
msgid "Hard"
msgstr "ബുദ്ധിമുട്ടുള്ളത്"
-#: src/playgame.c:954 src/titlescreen.c:92
+#: src/playgame.c:970 src/titlescreen.c:92
msgid "Practice"
msgstr "പരിശീലനം"
-#: src/playgame.c:965
+#: src/playgame.c:981
msgid "Congratulations"
msgstr "കൊള്ളാലോ!!!"
-#: src/playgame.c:969
+#: src/playgame.c:985
msgid "Oh No!"
msgstr "അയ്യോ!.."
Modified: tuxtype/trunk/po/nb.po
===================================================================
--- tuxtype/trunk/po/nb.po 2008-08-19 08:16:56 UTC (rev 656)
+++ tuxtype/trunk/po/nb.po 2008-08-19 11:36:20 UTC (rev 657)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-18 15:29-0500\n"
+"POT-Creation-Date: 2008-08-18 21:04-0500\n"
"PO-Revision-Date: 2005-10-20 21:24+0200\n"
"Last-Translator: Trond Mæhlum <trondm at skolelinux.no>\n"
"Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
@@ -41,39 +41,39 @@
msgid "Press space bar to return to game"
msgstr "Trykk mellomrom for å gå tilbake til spillet."
-#: src/playgame.c:947
+#: src/playgame.c:963
msgid "Level"
msgstr "Nivå"
-#: src/playgame.c:948
+#: src/playgame.c:964
msgid "Lives"
msgstr "Liv"
-#: src/playgame.c:949
+#: src/playgame.c:965
msgid "Fish"
msgstr "Fisk"
-#: src/playgame.c:951 src/titlescreen.c:91
+#: src/playgame.c:967 src/titlescreen.c:91
msgid "Easy"
msgstr "Lett"
-#: src/playgame.c:952 src/titlescreen.c:92
+#: src/playgame.c:968 src/titlescreen.c:92
msgid "Medium"
msgstr "Middels"
-#: src/playgame.c:953 src/titlescreen.c:93
+#: src/playgame.c:969 src/titlescreen.c:93
msgid "Hard"
msgstr "Vanskelig"
-#: src/playgame.c:954 src/titlescreen.c:92
+#: src/playgame.c:970 src/titlescreen.c:92
msgid "Practice"
msgstr "Øving"
-#: src/playgame.c:965
+#: src/playgame.c:981
msgid "Congratulations"
msgstr "Gratulerer!"
-#: src/playgame.c:969
+#: src/playgame.c:985
msgid "Oh No!"
msgstr "Uff!"
Modified: tuxtype/trunk/po/ne.po
===================================================================
--- tuxtype/trunk/po/ne.po 2008-08-19 08:16:56 UTC (rev 656)
+++ tuxtype/trunk/po/ne.po 2008-08-19 11:36:20 UTC (rev 657)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-18 15:29-0500\n"
+"POT-Creation-Date: 2008-08-18 21:04-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Mobin M <mobinmohan at gmail.com>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -44,47 +44,47 @@
msgstr "खेलमा फर्कन स्पेस बार थिच्नुहोस । "
#
-#: src/playgame.c:947
+#: src/playgame.c:963
msgid "Level"
msgstr "श्रेणी"
#
-#: src/playgame.c:948
+#: src/playgame.c:964
msgid "Lives"
msgstr "जिवनहरु"
#
-#: src/playgame.c:949
+#: src/playgame.c:965
msgid "Fish"
msgstr "माछा"
#
-#: src/playgame.c:951 src/titlescreen.c:91
+#: src/playgame.c:967 src/titlescreen.c:91
msgid "Easy"
msgstr "सजिलो"
#
-#: src/playgame.c:952 src/titlescreen.c:92
+#: src/playgame.c:968 src/titlescreen.c:92
msgid "Medium"
msgstr "मध्यम"
#
-#: src/playgame.c:953 src/titlescreen.c:93
+#: src/playgame.c:969 src/titlescreen.c:93
msgid "Hard"
msgstr "कठिन"
#
-#: src/playgame.c:954 src/titlescreen.c:92
+#: src/playgame.c:970 src/titlescreen.c:92
msgid "Practice"
msgstr "प्रशिक्षण"
#
-#: src/playgame.c:965
+#: src/playgame.c:981
msgid "Congratulations"
msgstr "तपाइलाई बधाई छ!!!"
#
-#: src/playgame.c:969
+#: src/playgame.c:985
msgid "Oh No!"
msgstr "हेत्तेरिका!.."
Modified: tuxtype/trunk/po/nl.po
===================================================================
--- tuxtype/trunk/po/nl.po 2008-08-19 08:16:56 UTC (rev 656)
+++ tuxtype/trunk/po/nl.po 2008-08-19 11:36:20 UTC (rev 657)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Tuxtype\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-18 15:29-0500\n"
+"POT-Creation-Date: 2008-08-18 21:04-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -42,41 +42,41 @@
msgid "Press space bar to return to game"
msgstr "terug naar het spel? druk op spatiebalk"
-#: src/playgame.c:947
+#: src/playgame.c:963
msgid "Level"
msgstr "Level"
-#: src/playgame.c:948
+#: src/playgame.c:964
msgid "Lives"
msgstr "Levens"
-#: src/playgame.c:949
+#: src/playgame.c:965
msgid "Fish"
msgstr "Vissen"
# levels for Cascade game:
-#: src/playgame.c:951 src/titlescreen.c:91
+#: src/playgame.c:967 src/titlescreen.c:91
msgid "Easy"
msgstr "Gemakkelijk"
-#: src/playgame.c:952 src/titlescreen.c:92
+#: src/playgame.c:968 src/titlescreen.c:92
msgid "Medium"
msgstr "Moeilijker"
-#: src/playgame.c:953 src/titlescreen.c:93
+#: src/playgame.c:969 src/titlescreen.c:93
msgid "Hard"
msgstr "Echt Moeilijk"
# general stuff
-#: src/playgame.c:954 src/titlescreen.c:92
+#: src/playgame.c:970 src/titlescreen.c:92
msgid "Practice"
msgstr "Vingeroefeningen"
-#: src/playgame.c:965
+#: src/playgame.c:981
msgid "Congratulations"
msgstr "Gefeliciteerd !"
-#: src/playgame.c:969
+#: src/playgame.c:985
msgid "Oh No!"
msgstr "Oh Nee!"
Modified: tuxtype/trunk/po/nn.po
===================================================================
--- tuxtype/trunk/po/nn.po 2008-08-19 08:16:56 UTC (rev 656)
+++ tuxtype/trunk/po/nn.po 2008-08-19 11:36:20 UTC (rev 657)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-18 15:29-0500\n"
+"POT-Creation-Date: 2008-08-18 21:04-0500\n"
"PO-Revision-Date: 2005-02-12 13:13+0100\n"
"Last-Translator: Karl Ove Hufthammer <karl at huftis.org>\n"
"Language-Team: Norwegian Nynorsk <i18n-nn at lister.ping.uio.no>\n"
@@ -40,39 +40,39 @@
msgid "Press space bar to return to game"
msgstr "Trykk mellomromstasten for å gå tilbake til spelet."
-#: src/playgame.c:947
+#: src/playgame.c:963
msgid "Level"
msgstr "Nivå"
-#: src/playgame.c:948
+#: src/playgame.c:964
msgid "Lives"
msgstr "Liv"
-#: src/playgame.c:949
+#: src/playgame.c:965
msgid "Fish"
msgstr "Fisk"
-#: src/playgame.c:951 src/titlescreen.c:91
+#: src/playgame.c:967 src/titlescreen.c:91
msgid "Easy"
msgstr "Lett"
-#: src/playgame.c:952 src/titlescreen.c:92
+#: src/playgame.c:968 src/titlescreen.c:92
msgid "Medium"
msgstr "Middels"
-#: src/playgame.c:953 src/titlescreen.c:93
+#: src/playgame.c:969 src/titlescreen.c:93
msgid "Hard"
msgstr "Vanskeleg"
-#: src/playgame.c:954 src/titlescreen.c:92
+#: src/playgame.c:970 src/titlescreen.c:92
msgid "Practice"
msgstr "Øving"
-#: src/playgame.c:965
+#: src/playgame.c:981
msgid "Congratulations"
msgstr "Gratulerer!"
-#: src/playgame.c:969
+#: src/playgame.c:985
msgid "Oh No!"
msgstr "Uff!"
Modified: tuxtype/trunk/po/pt.po
===================================================================
--- tuxtype/trunk/po/pt.po 2008-08-19 08:16:56 UTC (rev 656)
+++ tuxtype/trunk/po/pt.po 2008-08-19 11:36:20 UTC (rev 657)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-18 15:29-0500\n"
+"POT-Creation-Date: 2008-08-18 21:04-0500\n"
"PO-Revision-Date: 2007-02-07 16:08+0000\n"
"Last-Translator: Hudson G M Figueredo <kynder at pquilinux.org>\n"
"Language-Team: <pt at li.org>\n"
@@ -39,41 +39,41 @@
msgid "Press space bar to return to game"
msgstr "Pressione a barra de espaço para voltar ao jogo"
-#: src/playgame.c:947
+#: src/playgame.c:963
msgid "Level"
msgstr "Nível"
-#: src/playgame.c:948
+#: src/playgame.c:964
msgid "Lives"
msgstr "Vidas"
-#: src/playgame.c:949
+#: src/playgame.c:965
msgid "Fish"
msgstr "Peixes"
# levels for Cascade game:
-#: src/playgame.c:951 src/titlescreen.c:91
+#: src/playgame.c:967 src/titlescreen.c:91
msgid "Easy"
msgstr "Fácil"
-#: src/playgame.c:952 src/titlescreen.c:92
+#: src/playgame.c:968 src/titlescreen.c:92
msgid "Medium"
msgstr "Médio"
-#: src/playgame.c:953 src/titlescreen.c:93
+#: src/playgame.c:969 src/titlescreen.c:93
msgid "Hard"
msgstr "Difícil"
# general stuff
-#: src/playgame.c:954 src/titlescreen.c:92
+#: src/playgame.c:970 src/titlescreen.c:92
msgid "Practice"
msgstr "Praticar"
-#: src/playgame.c:965
+#: src/playgame.c:981
msgid "Congratulations"
msgstr "Parabéns"
-#: src/playgame.c:969
+#: src/playgame.c:985
msgid "Oh No!"
msgstr "Ah não!"
Modified: tuxtype/trunk/po/ru.po
===================================================================
--- tuxtype/trunk/po/ru.po 2008-08-19 08:16:56 UTC (rev 656)
+++ tuxtype/trunk/po/ru.po 2008-08-19 11:36:20 UTC (rev 657)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-18 15:29-0500\n"
+"POT-Creation-Date: 2008-08-18 21:04-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Mobin M <mobinmohan at gmail.com>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -40,39 +40,39 @@
msgid "Press space bar to return to game"
msgstr "Нажмите пробел для возврата к игре"
-#: src/playgame.c:947
+#: src/playgame.c:963
msgid "Level"
msgstr "Уровень"
-#: src/playgame.c:948
+#: src/playgame.c:964
msgid "Lives"
msgstr "Жизней"
-#: src/playgame.c:949
+#: src/playgame.c:965
msgid "Fish"
msgstr "Рыб"
-#: src/playgame.c:951 src/titlescreen.c:91
+#: src/playgame.c:967 src/titlescreen.c:91
msgid "Easy"
msgstr "Легкий"
-#: src/playgame.c:952 src/titlescreen.c:92
+#: src/playgame.c:968 src/titlescreen.c:92
msgid "Medium"
msgstr "Средний"
-#: src/playgame.c:953 src/titlescreen.c:93
+#: src/playgame.c:969 src/titlescreen.c:93
msgid "Hard"
msgstr "Сложный"
-#: src/playgame.c:954 src/titlescreen.c:92
+#: src/playgame.c:970 src/titlescreen.c:92
msgid "Practice"
msgstr "Практика"
-#: src/playgame.c:965
+#: src/playgame.c:981
msgid "Congratulations"
msgstr "Поздравляем"
-#: src/playgame.c:969
+#: src/playgame.c:985
msgid "Oh No!"
msgstr "О, нет!"
Modified: tuxtype/trunk/po/sv.po
===================================================================
--- tuxtype/trunk/po/sv.po 2008-08-19 08:16:56 UTC (rev 656)
+++ tuxtype/trunk/po/sv.po 2008-08-19 11:36:20 UTC (rev 657)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: tuxtype2 1.5.1\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-18 15:29-0500\n"
+"POT-Creation-Date: 2008-08-18 21:04-0500\n"
"PO-Revision-Date: 2003-07-23 17:44+0200\n"
"Last-Translator: Göran Uddeborg <goeran at uddeborg.se>\n"
"Language-Team: Swedish <sv at li.org>\n"
@@ -39,41 +39,41 @@
msgid "Press space bar to return to game"
msgstr "Tryck mellanslag för att fortsätta spela"
-#: src/playgame.c:947
+#: src/playgame.c:963
msgid "Level"
msgstr "Nivå"
-#: src/playgame.c:948
+#: src/playgame.c:964
msgid "Lives"
msgstr "Liv"
-#: src/playgame.c:949
+#: src/playgame.c:965
msgid "Fish"
msgstr "Fisk"
# levels for Cascade game:
-#: src/playgame.c:951 src/titlescreen.c:91
+#: src/playgame.c:967 src/titlescreen.c:91
msgid "Easy"
msgstr "Lätt"
-#: src/playgame.c:952 src/titlescreen.c:92
+#: src/playgame.c:968 src/titlescreen.c:92
msgid "Medium"
msgstr "Mellan"
-#: src/playgame.c:953 src/titlescreen.c:93
+#: src/playgame.c:969 src/titlescreen.c:93
msgid "Hard"
msgstr "Svårt"
# general stuff
-#: src/playgame.c:954 src/titlescreen.c:92
+#: src/playgame.c:970 src/titlescreen.c:92
msgid "Practice"
msgstr "Övning"
-#: src/playgame.c:965
+#: src/playgame.c:981
msgid "Congratulations"
msgstr "Gratulerar"
-#: src/playgame.c:969
+#: src/playgame.c:985
msgid "Oh No!"
msgstr "Åh nej!"
Modified: tuxtype/trunk/po/sw.po
===================================================================
--- tuxtype/trunk/po/sw.po 2008-08-19 08:16:56 UTC (rev 656)
+++ tuxtype/trunk/po/sw.po 2008-08-19 11:36:20 UTC (rev 657)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-18 15:29-0500\n"
+"POT-Creation-Date: 2008-08-18 21:04-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -40,41 +40,41 @@
msgid "Press space bar to return to game"
msgstr "Press space bar to return to game"
-#: src/playgame.c:947
+#: src/playgame.c:963
msgid "Level"
msgstr "Nivel"
-#: src/playgame.c:948
+#: src/playgame.c:964
msgid "Lives"
msgstr "Vidas"
-#: src/playgame.c:949
+#: src/playgame.c:965
msgid "Fish"
msgstr "Peces"
# levels for Cascade game:
-#: src/playgame.c:951 src/titlescreen.c:91
+#: src/playgame.c:967 src/titlescreen.c:91
msgid "Easy"
msgstr "Rahisi"
-#: src/playgame.c:952 src/titlescreen.c:92
+#: src/playgame.c:968 src/titlescreen.c:92
msgid "Medium"
msgstr "Ngumu"
-#: src/playgame.c:953 src/titlescreen.c:93
+#: src/playgame.c:969 src/titlescreen.c:93
msgid "Hard"
msgstr "Ngumu zaidi"
# general stuff
-#: src/playgame.c:954 src/titlescreen.c:92
+#: src/playgame.c:970 src/titlescreen.c:92
msgid "Practice"
msgstr "Jifunze"
-#: src/playgame.c:965
+#: src/playgame.c:981
msgid "Congratulations"
msgstr "Shukran"
-#: src/playgame.c:969
+#: src/playgame.c:985
msgid "Oh No!"
msgstr "Ahhhh"
Modified: tuxtype/trunk/po/tuxtype.pot
===================================================================
--- tuxtype/trunk/po/tuxtype.pot 2008-08-19 08:16:56 UTC (rev 656)
+++ tuxtype/trunk/po/tuxtype.pot 2008-08-19 11:36:20 UTC (rev 657)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-18 15:29-0500\n"
+"POT-Creation-Date: 2008-08-18 21:04-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -39,39 +39,39 @@
msgid "Press space bar to return to game"
msgstr ""
-#: src/playgame.c:947
+#: src/playgame.c:963
msgid "Level"
msgstr ""
-#: src/playgame.c:948
+#: src/playgame.c:964
msgid "Lives"
msgstr ""
-#: src/playgame.c:949
+#: src/playgame.c:965
msgid "Fish"
msgstr ""
-#: src/playgame.c:951 src/titlescreen.c:91
+#: src/playgame.c:967 src/titlescreen.c:91
msgid "Easy"
msgstr ""
-#: src/playgame.c:952 src/titlescreen.c:92
+#: src/playgame.c:968 src/titlescreen.c:92
msgid "Medium"
msgstr ""
-#: src/playgame.c:953 src/titlescreen.c:93
+#: src/playgame.c:969 src/titlescreen.c:93
msgid "Hard"
msgstr ""
-#: src/playgame.c:954 src/titlescreen.c:92
+#: src/playgame.c:970 src/titlescreen.c:92
msgid "Practice"
msgstr ""
-#: src/playgame.c:965
+#: src/playgame.c:981
msgid "Congratulations"
msgstr ""
-#: src/playgame.c:969
+#: src/playgame.c:985
msgid "Oh No!"
msgstr ""
Modified: tuxtype/trunk/po/wo.po
===================================================================
--- tuxtype/trunk/po/wo.po 2008-08-19 08:16:56 UTC (rev 656)
+++ tuxtype/trunk/po/wo.po 2008-08-19 11:36:20 UTC (rev 657)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-18 15:29-0500\n"
+"POT-Creation-Date: 2008-08-18 21:04-0500\n"
"PO-Revision-Date: 2007-09-25 09:50-0000\n"
"Last-Translator: Ousmane Faty Ndongo et Dominique Rochefort <alfanet at anafa."
"org>\n"
@@ -41,41 +41,41 @@
msgid "Press space bar to return to game"
msgstr "Bësal banqaasu teqale ngir fo"
-#: src/playgame.c:947
+#: src/playgame.c:963
msgid "Level"
msgstr "Tollu tollu"
-#: src/playgame.c:948
+#: src/playgame.c:964
msgid "Lives"
msgstr "Dund yi"
-#: src/playgame.c:949
+#: src/playgame.c:965
msgid "Fish"
msgstr "Jën yi"
# levels for Cascade game:
-#: src/playgame.c:951 src/titlescreen.c:91
+#: src/playgame.c:967 src/titlescreen.c:91
msgid "Easy"
msgstr "Yomb"
-#: src/playgame.c:952 src/titlescreen.c:92
+#: src/playgame.c:968 src/titlescreen.c:92
msgid "Medium"
msgstr "Ci diggante bi"
-#: src/playgame.c:953 src/titlescreen.c:93
+#: src/playgame.c:969 src/titlescreen.c:93
msgid "Hard"
msgstr "Dëgër"
# general stuff
-#: src/playgame.c:954 src/titlescreen.c:92
+#: src/playgame.c:970 src/titlescreen.c:92
msgid "Practice"
msgstr "Jëf ji"
-#: src/playgame.c:965
+#: src/playgame.c:981
msgid "Congratulations"
msgstr "Waaw góor"
-#: src/playgame.c:969
+#: src/playgame.c:985
msgid "Oh No!"
msgstr "Déedéet!"
Modified: tuxtype/trunk/src/playgame.c
===================================================================
--- tuxtype/trunk/src/playgame.c 2008-08-19 08:16:56 UTC (rev 656)
+++ tuxtype/trunk/src/playgame.c 2008-08-19 11:36:20 UTC (rev 657)
@@ -21,6 +21,7 @@
#include "funcs.h"
#include "playgame.h"
#include "snow.h"
+#include "SDL_extras.h"
#define _(String) gettext(String)
@@ -69,7 +70,7 @@
static void display_msg(const unsigned char* msg, int x, int y);
static void DrawBackground(void);
static void draw_bar(int curlevel, int diflevel, int curlives,
- int oldlives, int fish_left, int oldfish_left);
+ int oldlives, int fish_left, int oldfish_left);
static void DrawFish(int which);
static void DrawNumbers(int num, int x, int y, int places);
static int DrawObject(SDL_Surface* surf, int x, int y);
@@ -103,343 +104,397 @@
/*************************************************************************
* PlayCascade : This is the main Cascade game loop *
*************************************************************************/
-int PlayCascade( int diflevel ) {
- unsigned char filename[FNLEN];
- int still_playing = 1;
- int playing_level = 1;
- int setup_new_level = 1;
- int won_level = 0;
- int quitting = 0;
- int curlevel = 0;
- int i;
- int curlives;
- int oldlives=0, oldfish_left=0;
- int fish_left, fishies = 0, local_max_fishies=1;
- int frame = 0;
- int done_frames;
- int splats = 0;
- SDL_Event event;
- SDL_Surface *temp_text[CONGRATS_FRAMES + OH_NO_FRAMES];
- SDL_Rect text_rect;
- int text_y_end;
- int xamp, yamp, x_not, y_not;
- int temp_text_frames;
- int temp_text_count;
- Uint16 key_unicode;
+int PlayCascade(int diflevel)
+{
+ unsigned char filename[FNLEN];
+ int still_playing = 1;
+ int playing_level = 1;
+ int setup_new_level = 1;
+ int won_level = 0;
+ int quitting = 0;
+ int curlevel = 0;
+ int i;
+ int curlives;
+ int oldlives = 0;
+ int oldfish_left = 0;
+ int fish_left;
+ int fishies = 0;
+ int local_max_fishies = 1;
+ int frame = 0;
+ int done_frames;
+ int splats = 0;
+ SDL_Event event;
+ SDL_Surface *temp_text[CONGRATS_FRAMES + OH_NO_FRAMES];
+ SDL_Rect text_rect;
+ int text_y_end;
+ int xamp;
+ int yamp;
+ int x_not;
+ int y_not;
+ int temp_text_frames;
+ int temp_text_count;
+ Uint16 key_unicode;
- DEBUGCODE {
- fprintf(stderr, "->PlayCascade: level=%i\n", diflevel );
- }
+ DEBUGCODE
+ {
+ fprintf(stderr, "->Entering PlayCascade(): level=%i\n", diflevel);
+ }
- SDL_WarpMouse(screen->w / 2, screen->h / 2);
- SDL_ShowCursor(0);
+ SDL_WarpMouse(screen->w / 2, screen->h / 2);
+ SDL_ShowCursor(0);
- SNOW_init();
+// SNOW_init();
- LoadTuxAnims();
- LoadFishies();
- LoadOthers();
- RenderLetters(font);
- LOG( " Done rendering letters \n ");
+ LoadTuxAnims();
+ 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: */
- if (!CheckNeededGlyphs())
- {
- fprintf(stderr, "PlayCascade() - did not find all needed characters in theme's "
- "keyboard.lst file - returning to menu!\n\n\n");
- FreeGame();
- return 0;
- }
+ /* Make sure everything in the word list is "typable" according to the current */
+ /* theme's keyboard.lst: */
+ if (!CheckNeededGlyphs())
+ {
+ fprintf(stderr, "PlayCascade() - did not find all needed characters in theme's "
+ "keyboard.lst file - returning to menu!\n\n\n");
+ FreeGame();
+ return 0;
+ }
+ /* --------- Begin outer game loop (cycles once per level): ------------- */
- LOG( " starting game \n ");
- while (still_playing) {
+ LOG( " starting game \n ");
- if (setup_new_level) {
+ while (still_playing)
+ {
+ /* FIXME split out as smaller function */
+ if (setup_new_level)
+ {
+ switch (diflevel)
+ {
+ default:
+ case EASY:
+ fish_left = MAX_FISHIES_EASY;
- switch (diflevel) {
- case EASY:
- fish_left = MAX_FISHIES_EASY;
- if (settings.o_lives > LIVES_INIT_EASY){
- curlives = settings.o_lives;
- }else
- curlives = LIVES_INIT_EASY;
- break;
- case MEDIUM:
- fish_left = MAX_FISHIES_MEDIUM;
- if (settings.o_lives > LIVES_INIT_MEDIUM){
- curlives = settings.o_lives;
- }else
- curlives = LIVES_INIT_MEDIUM;
- break;
- case HARD:
- fish_left = MAX_FISHIES_HARD;
- if (settings.o_lives > LIVES_INIT_HARD){
- curlives = settings.o_lives;
- }else
- curlives = LIVES_INIT_HARD;
- break;
- }
+ if (settings.o_lives > LIVES_INIT_EASY)
+ curlives = settings.o_lives;
+ else
+ curlives = LIVES_INIT_EASY;
+ break;
- local_max_fishies = fish_left;
+ case MEDIUM:
+ fish_left = MAX_FISHIES_MEDIUM;
- if (curlevel != 0) {
- SDL_FreeSurface(background);
- }
+ if (settings.o_lives > LIVES_INIT_MEDIUM)
+ curlives = settings.o_lives;
+ else
+ curlives = LIVES_INIT_MEDIUM;
+ break;
- if (diflevel == INF_PRACT)
- sprintf(filename, "pract.png");
- else
- sprintf(filename, "kcas%i_%i.jpg", diflevel+1, curlevel+1);
+ case HARD:
+ fish_left = MAX_FISHIES_HARD;
- /* --- Special Hidden Code --- */
+ if (settings.o_lives > LIVES_INIT_HARD)
+ curlives = settings.o_lives;
+ else
+ curlives = LIVES_INIT_HARD;
+ break;
+ }
- if (settings.hidden && curlevel == 3)
- sprintf(filename, "hidden.jpg");
+ local_max_fishies = fish_left;
- DEBUGCODE {
- fprintf(stderr, "->>Loading background: %s\n", filename);
- }
+ /* ------- Load and draw background: ----------------- */
- background = LoadImage( filename, IMG_REGULAR );
- SNOW_setBkg( background );
+ if (curlevel != 0)
+ {
+ SDL_FreeSurface(background);
+ }
- DrawBackground();
+ if (diflevel == INF_PRACT)
+ sprintf(filename, "pract.png");
+ else
+ sprintf(filename, "kcas%i_%i.jpg", diflevel+1, curlevel+1);
- ResetObjects();
+ /* --- Special Hidden Code --- */
- if (settings.sys_sound) {
- sprintf(filename, "kmus%i.wav", curlevel + 1);
- MusicLoad( filename, -1 );
- }
+ if (settings.hidden && curlevel == 3)
+ sprintf(filename, "hidden.jpg");
- LOG( "->>PLAYING THE GAME\n" );
+ DEBUGCODE
+ {
+ fprintf(stderr, "->>Loading background: %s\n", filename);
+ }
- setup_new_level = 0;
- }
+ background = LoadImage( filename, IMG_REGULAR );
+// SNOW_setBkg( background );
- /* --- Poll input queue, get keyboard info --- */
+ DrawBackground();
- while (playing_level) {
+ ResetObjects();
- oldlives = curlives;
- oldfish_left = fish_left;
+ if (settings.sys_sound)
+ {
+ sprintf(filename, "kmus%i.wav", curlevel + 1);
+ MusicLoad( filename, -1 );
+ }
- EraseSprite( tux_object.spr[tux_object.state][tux_object.facing], tux_object.x, tux_object.y );
+ setup_new_level = 0;
- /* --- Checking input --- */
+ LOG( "->>PLAYING THE GAME\n" );
- while ( SDL_PollEvent( &event ) )
- if ( event.type == SDL_QUIT ) {
- exit(0);
- } else if (event.type == SDL_KEYDOWN) {
-
- if (event.key.keysym.sym == SDLK_F11)
- SDL_SaveBMP( screen, "screenshot.bmp" );
- if (event.key.keysym.sym == SDLK_F6){
- settings.o_lives=settings.o_lives-10;
- curlives=curlives-10;
- }
- if (event.key.keysym.sym == SDLK_F7) {
- settings.o_lives=settings.o_lives+10;
- curlives=curlives+10;
- }
- if (event.key.keysym.sym == SDLK_F10)
- SwitchScreenMode();
- if (event.key.keysym.sym == SDLK_F12)
- SNOW_toggle();
- if (event.key.keysym.sym == SDLK_ESCAPE) {
- /* Pause() returns 1 if quitting, */
- /* 0 if returning to game: */
- if (Pause() == 1) {
- playing_level = 0;
- still_playing = 0;
- quitting = 1;
- }
- DrawBackground();
- }
+ }
- key_unicode = event.key.keysym.unicode;
- //key_unicode = event.key.keysym.unicode & 0xff;
- /* For now, tuxtype is case-insensitive for input, */
- /* with only uppercase for answers: */
- DEBUGCODE
- {
- fprintf(stderr,
- "\nkey_unicode = %d\twchar_t = %lc\t\n",
- key_unicode, key_unicode);
- }
+ /* --------- Begin main game loop (cycles once per frame): ------------- */
- if (key_unicode >= 97 && key_unicode <= 122)
- key_unicode -= 32; //convert lowercase to uppercase
- if (key_unicode >= 224 && key_unicode <= 255)
- key_unicode -= 32; //same for non-US chars
- LOG ("After checking for lower case:\n");
- DEBUGCODE
- {
- fprintf(stderr,
- "key_unicode = %d\twchar_t = %lc\\n\n",
- key_unicode, key_unicode);
- }
+ while (playing_level)
+ {
+ oldlives = curlives;
+ oldfish_left = fish_left;
- /* Now update with case-folded value: */
- UpdateTux(key_unicode, fishies, frame);
- }
+ EraseSprite( tux_object.spr[tux_object.state][tux_object.facing], tux_object.x, tux_object.y );
- /* --- fishy updates --- */
+ /* --- Poll input queue, get keyboard info --- */
+ while (SDL_PollEvent(&event))
+ if ( event.type == SDL_QUIT )
+ {
+ exit(0); /* FIXME does memory get cleaned up properly if we do this? */
+ }
+ else
+ if (event.type == SDL_KEYDOWN)
+ {
+ if (event.key.keysym.sym == SDLK_F11)
+ SDL_SaveBMP(screen, "screenshot.bmp");
- if ((frame % 10) == 0) NEXT_FRAME( fishy );
-
- if (fishies < local_max_fishies)
- SpawnFishies( diflevel, &fishies, &frame );
+ if (event.key.keysym.sym == SDLK_F6)
+ {
+ settings.o_lives = settings.o_lives - 10;
+ curlives = curlives - 10;
+ }
- MoveTux( frame, fishies );
- CheckCollision(fishies, &fish_left, frame );
- DrawSprite( tux_object.spr[tux_object.state][tux_object.facing], tux_object.x, tux_object.y );
- MoveFishies(&fishies, &splats, &curlives, &frame);
- CheckFishies(&fishies, &splats);
- SNOW_update();
+ if (event.key.keysym.sym == SDLK_F7)
+ {
+ settings.o_lives = settings.o_lives + 10;
+ curlives = curlives + 10;
+ }
- /* --- update top score/info bar --- */
+ if (event.key.keysym.sym == SDLK_F10)
+ SwitchScreenMode();
- if (diflevel != INF_PRACT) {
- draw_bar(curlevel, diflevel, curlives, oldlives, fish_left, oldfish_left);
+ if (event.key.keysym.sym == SDLK_F12)
+// SNOW_toggle();
- if (curlives <= 0) {
- playing_level = 0;
- still_playing = 0;
- }
- } else
- fish_left = 1; // in practice there is always 1 fish left!
+ if (event.key.keysym.sym == SDLK_ESCAPE)
+ {
+ /* Pause() returns 1 if quitting, */
+ /* 0 if returning to game: */
+ if (Pause() == 1)
+ {
+ playing_level = 0;
+ still_playing = 0;
+ quitting = 1;
+ }
+ else /* Returning to game */
+ DrawBackground();
+ }
- if (fish_left <= 0) {
- won_level = 1;
- playing_level = 0;
- curlevel++;
- setup_new_level = 1;
- still_playing = 1;
- }
+ /*----------------------------------------------------*/
+ /* Some other key - player is actually typing!!!!!!!! */
+ /*----------------------------------------------------*/
- if (!quitting) {
- UpdateScreen(&frame);
+ /* See what Unicode value was typed: */
+ key_unicode = event.key.keysym.unicode;
- if (!settings.speed_up)
- WaitFrame();
- }
- }
+ DEBUGCODE
+ {
+ fprintf(stderr,
+ "\nkey_unicode = %d\twchar_t = %lc\t\n",
+ key_unicode, key_unicode);
+ }
- if (settings.sys_sound)
- Mix_FadeOutMusic(MUSIC_FADE_OUT_MS);
+ /* For now, the cascade game is case-insensitive for input, */
+ /* with only uppercase for answers: */
+ if (key_unicode >= 97 && key_unicode <= 122)
+ key_unicode -= 32; //convert lowercase to uppercase
+ if (key_unicode >= 224 && key_unicode <= 255)
+ key_unicode -= 32; //same for non-US chars
- DrawBackground();
+ LOG ("After checking for lower case:\n");
+ DEBUGCODE
+ {
+ fprintf(stderr,
+ "key_unicode = %d\twchar_t = %lc\\n\n",
+ key_unicode, key_unicode);
+ }
- if (quitting == 0) {
+ /* Now update with case-folded value: */
+ UpdateTux(key_unicode, fishies, frame);
+ }
- if (won_level) {
+ /* ---------- Done handling user input ----------- */
- won_level = 0;
- if (curlevel < 4) {
+ /* --- fishy updates --- */
+ if ((frame % 10) == 0)
+ NEXT_FRAME(fishy);
- LOG( "--->NEXT LEVEL!\n" );
+ if (fishies < local_max_fishies)
+ SpawnFishies( diflevel, &fishies, &frame );
- done_frames = MAX_END_FRAMES_BETWEEN_LEVELS;
- playing_level = 1;
- xamp = 0;
- yamp = 0;
+ MoveTux(frame, fishies);
+ CheckCollision(fishies, &fish_left, frame);
+ DrawSprite(tux_object.spr[tux_object.state][tux_object.facing], tux_object.x, tux_object.y);
+ MoveFishies(&fishies, &splats, &curlives, &frame);
+ CheckFishies(&fishies, &splats);
+// SNOW_update();
- } else {
+ /* --- update top score/info bar --- */
- LOG( "--->WINNER!\n" );
+ if (diflevel != INF_PRACT)
+ {
+ draw_bar(curlevel, diflevel, curlives, oldlives, fish_left, oldfish_left);
- done_frames = MAX_END_FRAMES_WIN_GAME;
- still_playing = 0;
- xamp = WIN_GAME_XAMP;
- yamp = WIN_GAME_YAMP;
+ if (curlives <= 0)
+ {
+ playing_level = 0;
+ still_playing = 0;
+ }
+ }
+ else
+ fish_left = 1; // in practice there is always 1 fish left!
- if (settings.sys_sound)
- Mix_PlayChannel(WINFINAL_WAV, sound[WINFINAL_WAV], 0);
- }
+ if (fish_left <= 0)
+ {
+ won_level = 1;
+ playing_level = 0;
+ curlevel++;
+ setup_new_level = 1;
+ still_playing = 1;
+ }
- if (settings.sys_sound)
- Mix_PlayChannel(WIN_WAV, sound[WIN_WAV], 0);
+ if (!quitting)
+ {
+ UpdateScreen(&frame);
- for (i = 0; i < CONGRATS_FRAMES; i++)
- temp_text[i] = congrats[i];
+ if (!settings.speed_up)
+ WaitFrame();
+ }
+ } /* End per-frame game loop - level completed */
- temp_text_frames = CONGRATS_FRAMES;
- tux_object.state = TUX_WINNING;
- } else {
+ if (settings.sys_sound)
+ Mix_FadeOutMusic(MUSIC_FADE_OUT_MS);
- LOG( "--->LOST :(\n" );
+ DrawBackground();
- done_frames = MAX_END_FRAMES_GAMEOVER;
- xamp = 0;
- yamp = 0;
+ /* Victory sequence, defeat sequence, or go to next level: */
+ if (quitting == 0)
+ {
+ /* Level completed successfully: */
+ if (won_level)
+ {
+ if (curlevel < 4) /* Advance to next level */
+ {
+ LOG( "--->NEXT LEVEL!\n" );
+ done_frames = MAX_END_FRAMES_BETWEEN_LEVELS;
+ playing_level = 1;
+ xamp = 0;
+ yamp = 0;
+ won_level = 0;
+ }
+ else
+ {
+ LOG( "--->WINNER!\n" );
+ done_frames = MAX_END_FRAMES_WIN_GAME;
+ still_playing = 0;
+ xamp = WIN_GAME_XAMP;
+ yamp = WIN_GAME_YAMP;
- if (settings.sys_sound)
- Mix_PlayChannel(LOSE_WAV, sound[LOSE_WAV], 0);
+ if (settings.sys_sound)
+ Mix_PlayChannel(WINFINAL_WAV, sound[WINFINAL_WAV], 0);
+ }
- for (i = 0; i < OH_NO_FRAMES; i++)
- temp_text[i] = ohno[i];
+ if (settings.sys_sound)
+ Mix_PlayChannel(WIN_WAV, sound[WIN_WAV], 0);
- temp_text_frames = OH_NO_FRAMES;
- tux_object.state = TUX_YIPING;
- }
+ for (i = 0; i < CONGRATS_FRAMES; i++)
+ temp_text[i] = congrats[i];
- /* --- draw the animation here --- */
+ temp_text_frames = CONGRATS_FRAMES;
+ tux_object.state = TUX_WINNING;
- temp_text_count = 0;
- text_y_end = (screen->h / 2) - (temp_text[0]->h / 2);
- text_rect.x = (screen->w / 2) - (temp_text[0]->w / 2);
- text_rect.y = screen->h - temp_text[0]->h - 1;
- x_not = text_rect.x;
+ }
+ else /* Did not win the level :-( */
+ {
+ LOG( "--->LOST :(\n" );
+ done_frames = MAX_END_FRAMES_GAMEOVER;
+ xamp = 0;
+ yamp = 0;
- LOG( "--->Starting Ending Animation\n" );
-
- for ( i=0; i<= done_frames; i++ ) {
- temp_text_count = (temp_text_count+1) % temp_text_frames;
+ if (settings.sys_sound)
+ Mix_PlayChannel(LOSE_WAV, sound[LOSE_WAV], 0);
- text_rect.y -= END_FRAME_DY;
- y_not = text_rect.y;
+ for (i = 0; i < OH_NO_FRAMES; i++)
+ temp_text[i] = ohno[i];
- if (text_rect.y < text_y_end) {
- y_not = text_y_end + yamp * sin(i / WIN_GAME_ANGLE_MULT);
- text_rect.y = text_y_end;
- text_rect.x = x_not + xamp * cos(i / WIN_GAME_ANGLE_MULT);
- }
+ temp_text_frames = OH_NO_FRAMES;
+ tux_object.state = TUX_YIPING;
+ }
- DrawSprite( tux_object.spr[tux_object.state][tux_object.facing], tux_object.x, tux_object.y );
- DrawObject(temp_text[temp_text_count], text_rect.x, y_not);
- DrawObject(level[diflevel], 1, 1);
- draw_bar(curlevel - 1, diflevel, curlives, oldlives, fish_left, oldfish_left);
+ /* --- draw the animation here --- */
- next_tux_frame();
- SNOW_update();
- UpdateScreen(&frame);
+ temp_text_count = 0;
+ text_y_end = (screen->h / 2) - (temp_text[0]->h / 2);
+ text_rect.x = (screen->w / 2) - (temp_text[0]->w / 2);
+ text_rect.y = screen->h - temp_text[0]->h - 1;
+ x_not = text_rect.x;
- EraseSprite( tux_object.spr[tux_object.state][tux_object.facing], tux_object.x, tux_object.y );
-
- EraseObject(temp_text[temp_text_count], text_rect.x, y_not);
+ LOG( "--->Starting Ending Animation\n" );
- if (!settings.speed_up)
- WaitFrame();
- }
- }
- }
+ for ( i=0; i<= done_frames; i++ )
+ {
+ temp_text_count = (temp_text_count+1) % temp_text_frames;
- SNOW_on = 0;
+ text_rect.y -= END_FRAME_DY;
+ y_not = text_rect.y;
- LOG( "->Done with level... cleaning up\n" );
+ if (text_rect.y < text_y_end)
+ {
+ y_not = text_y_end + yamp * sin(i / WIN_GAME_ANGLE_MULT);
+ text_rect.y = text_y_end;
+ text_rect.x = x_not + xamp * cos(i / WIN_GAME_ANGLE_MULT);
+ }
- FreeGame();
+ DrawSprite( tux_object.spr[tux_object.state][tux_object.facing], tux_object.x, tux_object.y );
+ DrawObject(temp_text[temp_text_count], text_rect.x, y_not);
+ DrawObject(level[diflevel], 1, 1);
+ draw_bar(curlevel - 1, diflevel, curlives, oldlives, fish_left, oldfish_left);
- LOG( "->PlayCascade: END\n" );
+ next_tux_frame();
+// SNOW_update();
+ /* Do all pending blits and increment frame counter: */
+ UpdateScreen(&frame);
- return 1;
+ EraseSprite( tux_object.spr[tux_object.state][tux_object.facing], tux_object.x, tux_object.y );
+ EraseObject(temp_text[temp_text_count], text_rect.x, y_not);
+
+ if (!settings.speed_up)
+ WaitFrame();
+ } /* End of animation for end of game */
+
+ } /* End of post-level wrap-up */
+
+ } /* -------- End outer game loop -------------- */
+
+// SNOW_on = 0;
+
+ LOG( "->Done with level... cleaning up\n" );
+
+ FreeGame();
+
+ LOG( "->PlayCascade(): END\n" );
+
+ return 1;
}
@@ -775,28 +830,43 @@
static void UpdateScreen(int* frame)
{
int i;
+
LOG("Entering UpdateScreen()\n");
- /* -- First erase everything we need to -- */
- for (i = 0; i < numupdates; i++)
- if (blits[i].type == 'E')
- SDL_LowerBlit(blits[i].src, blits[i].srcrect, screen, blits[i].dstrect);
- SNOW_erase();
- /* -- then draw -- */
- for (i = 0; i < numupdates; i++)
- if (blits[i].type == 'D')
- SDL_BlitSurface(blits[i].src, blits[i].srcrect, screen, blits[i].dstrect);
- SNOW_draw();
+ /* -- First erase everything we need to -- */
+ for (i = 0; i < numupdates; i++)
+ {
+ if (blits[i].type == 'E')
+ SDL_LowerBlit(blits[i].src, blits[i].srcrect, screen, blits[i].dstrect);
+ }
- /* -- update the screen only where we need to! -- */
- if (SNOW_on)
- SDL_UpdateRects(screen, SNOW_add( (SDL_Rect*)&dstupdate, numupdates ), SNOW_rects);
- else
- SDL_UpdateRects(screen, numupdates, dstupdate);
+ LOG("Done erasing\n");
- numupdates = 0;
- *frame = *frame + 1;
+// SNOW_erase();
+ /* -- then draw -- */
+ for (i = 0; i < numupdates; i++)
+ {
+ if (blits[i].type == 'D')
+ SDL_BlitSurface(blits[i].src, blits[i].srcrect, screen, blits[i].dstrect);
+ }
+
+ LOG("Done drawing\n");
+
+// SNOW_draw();
+
+ /* -- update the screen only where we need to! -- */
+// if (SNOW_on)
+// SDL_UpdateRects(screen, SNOW_add( (SDL_Rect*)&dstupdate, numupdates ), SNOW_rects);
+// else
+// SDL_UpdateRects(screen, numupdates, dstupdate);
+
+ /* try something simpler for now: */
+ SDL_UpdateRect(screen, 0, 0, 0, 0);
+
+ numupdates = 0;
+ *frame = *frame + 1;
+
LOG("Leaving UpdateScreen()\n");
}
More information about the Tux4kids-commits
mailing list