[Tux4kids-commits] r668 - in tuxtype/trunk: . po src
dbruce-guest at alioth.debian.org
dbruce-guest at alioth.debian.org
Sat Aug 23 11:52:40 UTC 2008
Author: dbruce-guest
Date: 2008-08-23 11:52:40 +0000 (Sat, 23 Aug 2008)
New Revision: 668
Modified:
tuxtype/trunk/ChangeLog
tuxtype/trunk/ChangeLog~
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/funcs.h
tuxtype/trunk/src/laser.c
tuxtype/trunk/src/loaders.c
tuxtype/trunk/src/playgame.c
tuxtype/trunk/src/titlescreen.c
Log:
playgame.c reworked to draw background properly for native-resolution fullscreen
Modified: tuxtype/trunk/ChangeLog
===================================================================
--- tuxtype/trunk/ChangeLog 2008-08-23 01:37:51 UTC (rev 667)
+++ tuxtype/trunk/ChangeLog 2008-08-23 11:52:40 UTC (rev 668)
@@ -1,3 +1,12 @@
+22 Aug 2008 - svn revision 668
+[ David Bruce <davidstuartbruce at gmail.com> ]
+ - Extensive revision to support fullscreen mode at resolution of OS rather than only 640x480.
+ Menu system and comet zap work, fish cascade now works in fullscreen but cannot handle
+ toggle of resolution in midstream; practice and lessons still need to be fixed to
+ handle new fullscreen mode.
+ - Using GNU iconv() instead of Unicode Inc.'s conversion code
+ - SDL_extras brought in from tuxmath for DrawButton(), streamlined BlackOutline(), etc.
+
18 Aug 2008 - svn revision 647
[ Sreyas Kurumanghat <k.sreyas at gmail.com ]
- Added features to practice game. Now pressing the down arrow presents the next phrase for practice and the escape key quits from the game.
Modified: tuxtype/trunk/ChangeLog~
===================================================================
--- tuxtype/trunk/ChangeLog~ 2008-08-23 01:37:51 UTC (rev 667)
+++ tuxtype/trunk/ChangeLog~ 2008-08-23 11:52:40 UTC (rev 668)
@@ -1,4 +1,4 @@
-18 Aug 2008 - svn revision 646
+18 Aug 2008 - svn revision 647
[ Sreyas Kurumanghat <k.sreyas at gmail.com ]
- Added features to practice game. Now pressing the down arrow presents the next phrase for practice and the escape key quits from the game.
Modified: tuxtype/trunk/po/ar.po
===================================================================
--- tuxtype/trunk/po/ar.po 2008-08-23 01:37:51 UTC (rev 667)
+++ tuxtype/trunk/po/ar.po 2008-08-23 11:52:40 UTC (rev 668)
@@ -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-21 17:45-0500\n"
+"POT-Creation-Date: 2008-08-23 06:45-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:1019
+#: src/playgame.c:1040
msgid "Level"
msgstr "A[qarh"
-#: src/playgame.c:1020
+#: src/playgame.c:1041
msgid "Lives"
msgstr "G3ank"
-#: src/playgame.c:1021
+#: src/playgame.c:1042
msgid "Fish"
msgstr "@ovg"
# levels for Cascade game:
-#: src/playgame.c:1023 src/titlescreen.c:91
+#: src/playgame.c:1044 src/titlescreen.c:91
msgid "Easy"
msgstr "Tanta."
-#: src/playgame.c:1024 src/titlescreen.c:92
+#: src/playgame.c:1045 src/titlescreen.c:92
msgid "Medium"
msgstr "Medium"
-#: src/playgame.c:1025 src/titlescreen.c:93
+#: src/playgame.c:1046 src/titlescreen.c:93
msgid "Hard"
msgstr "Hard"
# general stuff
-#: src/playgame.c:1026 src/titlescreen.c:92
+#: src/playgame.c:1047 src/titlescreen.c:92
msgid "Practice"
msgstr "Practice"
-#: src/playgame.c:1037
+#: src/playgame.c:1058
msgid "Congratulations"
msgstr "Congratulations"
-#: src/playgame.c:1041
+#: src/playgame.c:1062
msgid "Oh No!"
msgstr "Oh No!"
Modified: tuxtype/trunk/po/ca.po
===================================================================
--- tuxtype/trunk/po/ca.po 2008-08-23 01:37:51 UTC (rev 667)
+++ tuxtype/trunk/po/ca.po 2008-08-23 11:52:40 UTC (rev 668)
@@ -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-21 17:45-0500\n"
+"POT-Creation-Date: 2008-08-23 06:45-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:1019
+#: src/playgame.c:1040
msgid "Level"
msgstr "Nivell"
-#: src/playgame.c:1020
+#: src/playgame.c:1041
msgid "Lives"
msgstr "Vides"
-#: src/playgame.c:1021
+#: src/playgame.c:1042
msgid "Fish"
msgstr "Peix"
# levels for Cascade game:
-#: src/playgame.c:1023 src/titlescreen.c:91
+#: src/playgame.c:1044 src/titlescreen.c:91
msgid "Easy"
msgstr "Fàcil"
-#: src/playgame.c:1024 src/titlescreen.c:92
+#: src/playgame.c:1045 src/titlescreen.c:92
msgid "Medium"
msgstr "Mitg"
-#: src/playgame.c:1025 src/titlescreen.c:93
+#: src/playgame.c:1046 src/titlescreen.c:93
msgid "Hard"
msgstr "Difícil"
# general stuff
-#: src/playgame.c:1026 src/titlescreen.c:92
+#: src/playgame.c:1047 src/titlescreen.c:92
msgid "Practice"
msgstr "Practicar"
-#: src/playgame.c:1037
+#: src/playgame.c:1058
msgid "Congratulations"
msgstr "L'enhorabona!"
-#: src/playgame.c:1041
+#: src/playgame.c:1062
msgid "Oh No!"
msgstr "Oh No!"
Modified: tuxtype/trunk/po/cs.po
===================================================================
--- tuxtype/trunk/po/cs.po 2008-08-23 01:37:51 UTC (rev 667)
+++ tuxtype/trunk/po/cs.po 2008-08-23 11:52:40 UTC (rev 668)
@@ -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-21 17:45-0500\n"
+"POT-Creation-Date: 2008-08-23 06:45-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:1019
+#: src/playgame.c:1040
msgid "Level"
msgstr "Úroveň"
#
-#: src/playgame.c:1020
+#: src/playgame.c:1041
msgid "Lives"
msgstr "Životy"
#
-#: src/playgame.c:1021
+#: src/playgame.c:1042
msgid "Fish"
msgstr "Ryba"
#
-#: src/playgame.c:1023 src/titlescreen.c:91
+#: src/playgame.c:1044 src/titlescreen.c:91
msgid "Easy"
msgstr "Snadná"
#
-#: src/playgame.c:1024 src/titlescreen.c:92
+#: src/playgame.c:1045 src/titlescreen.c:92
msgid "Medium"
msgstr "Střední"
#
-#: src/playgame.c:1025 src/titlescreen.c:93
+#: src/playgame.c:1046 src/titlescreen.c:93
msgid "Hard"
msgstr "Těžká"
#
-#: src/playgame.c:1026 src/titlescreen.c:92
+#: src/playgame.c:1047 src/titlescreen.c:92
msgid "Practice"
msgstr "Procvičování"
#
-#: src/playgame.c:1037
+#: src/playgame.c:1058
msgid "Congratulations"
msgstr "Gratuluji"
#
-#: src/playgame.c:1041
+#: src/playgame.c:1062
msgid "Oh No!"
msgstr "Ach jo!"
Modified: tuxtype/trunk/po/da.po
===================================================================
--- tuxtype/trunk/po/da.po 2008-08-23 01:37:51 UTC (rev 667)
+++ tuxtype/trunk/po/da.po 2008-08-23 11:52:40 UTC (rev 668)
@@ -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-21 17:45-0500\n"
+"POT-Creation-Date: 2008-08-23 06:45-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:1019
+#: src/playgame.c:1040
msgid "Level"
msgstr "Niveau"
-#: src/playgame.c:1020
+#: src/playgame.c:1041
msgid "Lives"
msgstr "Liv"
-#: src/playgame.c:1021
+#: src/playgame.c:1042
msgid "Fish"
msgstr "Fisk"
# levels for Cascade game:
-#: src/playgame.c:1023 src/titlescreen.c:91
+#: src/playgame.c:1044 src/titlescreen.c:91
msgid "Easy"
msgstr "Let"
-#: src/playgame.c:1024 src/titlescreen.c:92
+#: src/playgame.c:1045 src/titlescreen.c:92
msgid "Medium"
msgstr "Mellem"
-#: src/playgame.c:1025 src/titlescreen.c:93
+#: src/playgame.c:1046 src/titlescreen.c:93
msgid "Hard"
msgstr "Hård"
# general stuff
-#: src/playgame.c:1026 src/titlescreen.c:92
+#: src/playgame.c:1047 src/titlescreen.c:92
msgid "Practice"
msgstr "Øv dig!"
-#: src/playgame.c:1037
+#: src/playgame.c:1058
msgid "Congratulations"
msgstr "Tillykke!"
-#: src/playgame.c:1041
+#: src/playgame.c:1062
msgid "Oh No!"
msgstr "Åh nej!"
Modified: tuxtype/trunk/po/de.po
===================================================================
--- tuxtype/trunk/po/de.po 2008-08-23 01:37:51 UTC (rev 667)
+++ tuxtype/trunk/po/de.po 2008-08-23 11:52:40 UTC (rev 668)
@@ -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-21 17:45-0500\n"
+"POT-Creation-Date: 2008-08-23 06:45-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:1019
+#: src/playgame.c:1040
msgid "Level"
msgstr "Runde"
-#: src/playgame.c:1020
+#: src/playgame.c:1041
msgid "Lives"
msgstr "Leben"
-#: src/playgame.c:1021
+#: src/playgame.c:1042
msgid "Fish"
msgstr "Fisch"
# levels for Cascade game:
-#: src/playgame.c:1023 src/titlescreen.c:91
+#: src/playgame.c:1044 src/titlescreen.c:91
msgid "Easy"
msgstr "Einfach"
-#: src/playgame.c:1024 src/titlescreen.c:92
+#: src/playgame.c:1045 src/titlescreen.c:92
msgid "Medium"
msgstr "Mittel"
-#: src/playgame.c:1025 src/titlescreen.c:93
+#: src/playgame.c:1046 src/titlescreen.c:93
msgid "Hard"
msgstr "Schwer"
# general stuff
-#: src/playgame.c:1026 src/titlescreen.c:92
+#: src/playgame.c:1047 src/titlescreen.c:92
msgid "Practice"
msgstr "Fingerübung"
-#: src/playgame.c:1037
+#: src/playgame.c:1058
msgid "Congratulations"
msgstr "Herzlichen Glückwunsch!"
-#: src/playgame.c:1041
+#: src/playgame.c:1062
msgid "Oh No!"
msgstr "Oh Nein!"
Modified: tuxtype/trunk/po/el.po
===================================================================
--- tuxtype/trunk/po/el.po 2008-08-23 01:37:51 UTC (rev 667)
+++ tuxtype/trunk/po/el.po 2008-08-23 11:52:40 UTC (rev 668)
@@ -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-21 17:45-0500\n"
+"POT-Creation-Date: 2008-08-23 06:45-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:1019
+#: src/playgame.c:1040
msgid "Level"
msgstr "Επίπεδο"
-#: src/playgame.c:1020
+#: src/playgame.c:1041
msgid "Lives"
msgstr "Ζωές"
-#: src/playgame.c:1021
+#: src/playgame.c:1042
msgid "Fish"
msgstr "Ψάρια"
# levels for Cascade game:
-#: src/playgame.c:1023 src/titlescreen.c:91
+#: src/playgame.c:1044 src/titlescreen.c:91
msgid "Easy"
msgstr "1. Εύκολο"
-#: src/playgame.c:1024 src/titlescreen.c:92
+#: src/playgame.c:1045 src/titlescreen.c:92
msgid "Medium"
msgstr "2. Κανονικό"
-#: src/playgame.c:1025 src/titlescreen.c:93
+#: src/playgame.c:1046 src/titlescreen.c:93
msgid "Hard"
msgstr "3. Δύσκολο"
# general stuff
-#: src/playgame.c:1026 src/titlescreen.c:92
+#: src/playgame.c:1047 src/titlescreen.c:92
msgid "Practice"
msgstr "Εξάσκηση"
-#: src/playgame.c:1037
+#: src/playgame.c:1058
msgid "Congratulations"
msgstr "Συγχαρητήρια"
-#: src/playgame.c:1041
+#: src/playgame.c:1062
msgid "Oh No!"
msgstr "Ωχ! Όχι"
Modified: tuxtype/trunk/po/en at boldquot.po
===================================================================
--- tuxtype/trunk/po/en at boldquot.po 2008-08-23 01:37:51 UTC (rev 667)
+++ tuxtype/trunk/po/en at boldquot.po 2008-08-23 11:52:40 UTC (rev 668)
@@ -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-21 17:45-0500\n"
-"PO-Revision-Date: 2008-08-21 17:45-0500\n"
+"POT-Creation-Date: 2008-08-23 06:45-0500\n"
+"PO-Revision-Date: 2008-08-23 06:45-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:1019
+#: src/playgame.c:1040
msgid "Level"
msgstr "Level"
-#: src/playgame.c:1020
+#: src/playgame.c:1041
msgid "Lives"
msgstr "Lives"
-#: src/playgame.c:1021
+#: src/playgame.c:1042
msgid "Fish"
msgstr "Fish"
-#: src/playgame.c:1023 src/titlescreen.c:91
+#: src/playgame.c:1044 src/titlescreen.c:91
msgid "Easy"
msgstr "Easy"
-#: src/playgame.c:1024 src/titlescreen.c:92
+#: src/playgame.c:1045 src/titlescreen.c:92
msgid "Medium"
msgstr "Medium"
-#: src/playgame.c:1025 src/titlescreen.c:93
+#: src/playgame.c:1046 src/titlescreen.c:93
msgid "Hard"
msgstr "Hard"
-#: src/playgame.c:1026 src/titlescreen.c:92
+#: src/playgame.c:1047 src/titlescreen.c:92
msgid "Practice"
msgstr "Practice"
-#: src/playgame.c:1037
+#: src/playgame.c:1058
msgid "Congratulations"
msgstr "Congratulations"
-#: src/playgame.c:1041
+#: src/playgame.c:1062
msgid "Oh No!"
msgstr "Oh No!"
Modified: tuxtype/trunk/po/en at quot.po
===================================================================
--- tuxtype/trunk/po/en at quot.po 2008-08-23 01:37:51 UTC (rev 667)
+++ tuxtype/trunk/po/en at quot.po 2008-08-23 11:52:40 UTC (rev 668)
@@ -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-21 17:45-0500\n"
-"PO-Revision-Date: 2008-08-21 17:45-0500\n"
+"POT-Creation-Date: 2008-08-23 06:45-0500\n"
+"PO-Revision-Date: 2008-08-23 06:45-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:1019
+#: src/playgame.c:1040
msgid "Level"
msgstr "Level"
-#: src/playgame.c:1020
+#: src/playgame.c:1041
msgid "Lives"
msgstr "Lives"
-#: src/playgame.c:1021
+#: src/playgame.c:1042
msgid "Fish"
msgstr "Fish"
-#: src/playgame.c:1023 src/titlescreen.c:91
+#: src/playgame.c:1044 src/titlescreen.c:91
msgid "Easy"
msgstr "Easy"
-#: src/playgame.c:1024 src/titlescreen.c:92
+#: src/playgame.c:1045 src/titlescreen.c:92
msgid "Medium"
msgstr "Medium"
-#: src/playgame.c:1025 src/titlescreen.c:93
+#: src/playgame.c:1046 src/titlescreen.c:93
msgid "Hard"
msgstr "Hard"
-#: src/playgame.c:1026 src/titlescreen.c:92
+#: src/playgame.c:1047 src/titlescreen.c:92
msgid "Practice"
msgstr "Practice"
-#: src/playgame.c:1037
+#: src/playgame.c:1058
msgid "Congratulations"
msgstr "Congratulations"
-#: src/playgame.c:1041
+#: src/playgame.c:1062
msgid "Oh No!"
msgstr "Oh No!"
Modified: tuxtype/trunk/po/en_GB.po
===================================================================
--- tuxtype/trunk/po/en_GB.po 2008-08-23 01:37:51 UTC (rev 667)
+++ tuxtype/trunk/po/en_GB.po 2008-08-23 11:52:40 UTC (rev 668)
@@ -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-21 17:45-0500\n"
+"POT-Creation-Date: 2008-08-23 06:45-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:1019
+#: src/playgame.c:1040
msgid "Level"
msgstr ""
-#: src/playgame.c:1020
+#: src/playgame.c:1041
msgid "Lives"
msgstr ""
-#: src/playgame.c:1021
+#: src/playgame.c:1042
msgid "Fish"
msgstr ""
-#: src/playgame.c:1023 src/titlescreen.c:91
+#: src/playgame.c:1044 src/titlescreen.c:91
msgid "Easy"
msgstr ""
-#: src/playgame.c:1024 src/titlescreen.c:92
+#: src/playgame.c:1045 src/titlescreen.c:92
msgid "Medium"
msgstr ""
-#: src/playgame.c:1025 src/titlescreen.c:93
+#: src/playgame.c:1046 src/titlescreen.c:93
msgid "Hard"
msgstr ""
-#: src/playgame.c:1026 src/titlescreen.c:92
+#: src/playgame.c:1047 src/titlescreen.c:92
msgid "Practice"
msgstr ""
-#: src/playgame.c:1037
+#: src/playgame.c:1058
msgid "Congratulations"
msgstr ""
-#: src/playgame.c:1041
+#: src/playgame.c:1062
msgid "Oh No!"
msgstr ""
Modified: tuxtype/trunk/po/es.po
===================================================================
--- tuxtype/trunk/po/es.po 2008-08-23 01:37:51 UTC (rev 667)
+++ tuxtype/trunk/po/es.po 2008-08-23 11:52:40 UTC (rev 668)
@@ -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-21 17:45-0500\n"
+"POT-Creation-Date: 2008-08-23 06:45-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:1019
+#: src/playgame.c:1040
msgid "Level"
msgstr "Nivel"
-#: src/playgame.c:1020
+#: src/playgame.c:1041
msgid "Lives"
msgstr "Vidas"
-#: src/playgame.c:1021
+#: src/playgame.c:1042
msgid "Fish"
msgstr "Pescado"
# niveles para juego de cascada:
-#: src/playgame.c:1023 src/titlescreen.c:91
+#: src/playgame.c:1044 src/titlescreen.c:91
msgid "Easy"
msgstr "Fácil"
-#: src/playgame.c:1024 src/titlescreen.c:92
+#: src/playgame.c:1045 src/titlescreen.c:92
msgid "Medium"
msgstr "Medio"
-#: src/playgame.c:1025 src/titlescreen.c:93
+#: src/playgame.c:1046 src/titlescreen.c:93
msgid "Hard"
msgstr "Difícil"
# Cosas generales
-#: src/playgame.c:1026 src/titlescreen.c:92
+#: src/playgame.c:1047 src/titlescreen.c:92
msgid "Practice"
msgstr "Practicar"
-#: src/playgame.c:1037
+#: src/playgame.c:1058
msgid "Congratulations"
msgstr "¡Felicidades!"
-#: src/playgame.c:1041
+#: src/playgame.c:1062
msgid "Oh No!"
msgstr "¡Oh, no!"
Modified: tuxtype/trunk/po/eu.po
===================================================================
--- tuxtype/trunk/po/eu.po 2008-08-23 01:37:51 UTC (rev 667)
+++ tuxtype/trunk/po/eu.po 2008-08-23 11:52:40 UTC (rev 668)
@@ -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-21 17:45-0500\n"
+"POT-Creation-Date: 2008-08-23 06:45-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:1019
+#: src/playgame.c:1040
msgid "Level"
msgstr "Maila"
-#: src/playgame.c:1020
+#: src/playgame.c:1041
msgid "Lives"
msgstr "Bizitzak"
-#: src/playgame.c:1021
+#: src/playgame.c:1042
msgid "Fish"
msgstr "Arraina"
# levels for Cascade game:
-#: src/playgame.c:1023 src/titlescreen.c:91
+#: src/playgame.c:1044 src/titlescreen.c:91
msgid "Easy"
msgstr "Erreza"
-#: src/playgame.c:1024 src/titlescreen.c:92
+#: src/playgame.c:1045 src/titlescreen.c:92
msgid "Medium"
msgstr "Ertaina"
-#: src/playgame.c:1025 src/titlescreen.c:93
+#: src/playgame.c:1046 src/titlescreen.c:93
msgid "Hard"
msgstr "Gaitza"
# general stuff
-#: src/playgame.c:1026 src/titlescreen.c:92
+#: src/playgame.c:1047 src/titlescreen.c:92
msgid "Practice"
msgstr "Trebakuntza"
-#: src/playgame.c:1037
+#: src/playgame.c:1058
msgid "Congratulations"
msgstr "Zorionak"
-#: src/playgame.c:1041
+#: src/playgame.c:1062
msgid "Oh No!"
msgstr "Oi ez!"
Modified: tuxtype/trunk/po/fr.po
===================================================================
--- tuxtype/trunk/po/fr.po 2008-08-23 01:37:51 UTC (rev 667)
+++ tuxtype/trunk/po/fr.po 2008-08-23 11:52:40 UTC (rev 668)
@@ -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-21 17:45-0500\n"
+"POT-Creation-Date: 2008-08-23 06:45-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:1019
+#: src/playgame.c:1040
msgid "Level"
msgstr "Niveau"
-#: src/playgame.c:1020
+#: src/playgame.c:1041
msgid "Lives"
msgstr "Vies"
-#: src/playgame.c:1021
+#: src/playgame.c:1042
msgid "Fish"
msgstr "Poissons"
# levels for Cascade game:
-#: src/playgame.c:1023 src/titlescreen.c:91
+#: src/playgame.c:1044 src/titlescreen.c:91
msgid "Easy"
msgstr "Facile"
-#: src/playgame.c:1024 src/titlescreen.c:92
+#: src/playgame.c:1045 src/titlescreen.c:92
msgid "Medium"
msgstr "Moyen"
-#: src/playgame.c:1025 src/titlescreen.c:93
+#: src/playgame.c:1046 src/titlescreen.c:93
msgid "Hard"
msgstr "Fort"
# general stuff
-#: src/playgame.c:1026 src/titlescreen.c:92
+#: src/playgame.c:1047 src/titlescreen.c:92
msgid "Practice"
msgstr "Pratique"
-#: src/playgame.c:1037
+#: src/playgame.c:1058
msgid "Congratulations"
msgstr "Flicitations"
-#: src/playgame.c:1041
+#: src/playgame.c:1062
msgid "Oh No!"
msgstr "Oh Non!"
Modified: tuxtype/trunk/po/it.po
===================================================================
--- tuxtype/trunk/po/it.po 2008-08-23 01:37:51 UTC (rev 667)
+++ tuxtype/trunk/po/it.po 2008-08-23 11:52:40 UTC (rev 668)
@@ -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-21 17:45-0500\n"
+"POT-Creation-Date: 2008-08-23 06:45-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:1019
+#: src/playgame.c:1040
msgid "Level"
msgstr "Livello"
-#: src/playgame.c:1020
+#: src/playgame.c:1041
msgid "Lives"
msgstr "Vite"
-#: src/playgame.c:1021
+#: src/playgame.c:1042
msgid "Fish"
msgstr "Pesci"
# levels for Cascade game:
-#: src/playgame.c:1023 src/titlescreen.c:91
+#: src/playgame.c:1044 src/titlescreen.c:91
msgid "Easy"
msgstr "Facile"
-#: src/playgame.c:1024 src/titlescreen.c:92
+#: src/playgame.c:1045 src/titlescreen.c:92
msgid "Medium"
msgstr "Medio"
-#: src/playgame.c:1025 src/titlescreen.c:93
+#: src/playgame.c:1046 src/titlescreen.c:93
msgid "Hard"
msgstr "Difficile"
# general stuff
-#: src/playgame.c:1026 src/titlescreen.c:92
+#: src/playgame.c:1047 src/titlescreen.c:92
msgid "Practice"
msgstr "Pratica"
-#: src/playgame.c:1037
+#: src/playgame.c:1058
msgid "Congratulations"
msgstr "Congratulazioni"
-#: src/playgame.c:1041
+#: src/playgame.c:1062
msgid "Oh No!"
msgstr "Oh No! Prova di nuovo..."
Modified: tuxtype/trunk/po/ja.po
===================================================================
--- tuxtype/trunk/po/ja.po 2008-08-23 01:37:51 UTC (rev 667)
+++ tuxtype/trunk/po/ja.po 2008-08-23 11:52:40 UTC (rev 668)
@@ -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-21 17:45-0500\n"
+"POT-Creation-Date: 2008-08-23 06:45-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:1019
+#: src/playgame.c:1040
msgid "Level"
msgstr ""
-#: src/playgame.c:1020
+#: src/playgame.c:1041
msgid "Lives"
msgstr ""
-#: src/playgame.c:1021
+#: src/playgame.c:1042
msgid "Fish"
msgstr ""
-#: src/playgame.c:1023 src/titlescreen.c:91
+#: src/playgame.c:1044 src/titlescreen.c:91
msgid "Easy"
msgstr ""
-#: src/playgame.c:1024 src/titlescreen.c:92
+#: src/playgame.c:1045 src/titlescreen.c:92
msgid "Medium"
msgstr ""
-#: src/playgame.c:1025 src/titlescreen.c:93
+#: src/playgame.c:1046 src/titlescreen.c:93
msgid "Hard"
msgstr ""
-#: src/playgame.c:1026 src/titlescreen.c:92
+#: src/playgame.c:1047 src/titlescreen.c:92
msgid "Practice"
msgstr ""
-#: src/playgame.c:1037
+#: src/playgame.c:1058
msgid "Congratulations"
msgstr ""
-#: src/playgame.c:1041
+#: src/playgame.c:1062
msgid "Oh No!"
msgstr ""
Modified: tuxtype/trunk/po/lt.po
===================================================================
--- tuxtype/trunk/po/lt.po 2008-08-23 01:37:51 UTC (rev 667)
+++ tuxtype/trunk/po/lt.po 2008-08-23 11:52:40 UTC (rev 668)
@@ -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-21 17:45-0500\n"
+"POT-Creation-Date: 2008-08-23 06:45-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:1019
+#: src/playgame.c:1040
msgid "Level"
msgstr "lygis"
-#: src/playgame.c:1020
+#: src/playgame.c:1041
msgid "Lives"
msgstr "Meškerių:"
-#: src/playgame.c:1021
+#: src/playgame.c:1042
msgid "Fish"
msgstr "Žuvų:"
# levels for Cascade game:
-#: src/playgame.c:1023 src/titlescreen.c:91
+#: src/playgame.c:1044 src/titlescreen.c:91
msgid "Easy"
msgstr "Lengvas"
-#: src/playgame.c:1024 src/titlescreen.c:92
+#: src/playgame.c:1045 src/titlescreen.c:92
msgid "Medium"
msgstr "Vidutinis"
-#: src/playgame.c:1025 src/titlescreen.c:93
+#: src/playgame.c:1046 src/titlescreen.c:93
msgid "Hard"
msgstr "Sunkus"
# general stuff
-#: src/playgame.c:1026 src/titlescreen.c:92
+#: src/playgame.c:1047 src/titlescreen.c:92
msgid "Practice"
msgstr "Pirštų pratimai"
-#: src/playgame.c:1037
+#: src/playgame.c:1058
msgid "Congratulations"
msgstr "Sveikiname!"
-#: src/playgame.c:1041
+#: src/playgame.c:1062
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-23 01:37:51 UTC (rev 667)
+++ tuxtype/trunk/po/ml.po 2008-08-23 11:52:40 UTC (rev 668)
@@ -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-21 17:45-0500\n"
+"POT-Creation-Date: 2008-08-23 06:45-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:1019
+#: src/playgame.c:1040
msgid "Level"
msgstr "തട്ട്"
-#: src/playgame.c:1020
+#: src/playgame.c:1041
msgid "Lives"
msgstr "ആയുസ്സ്"
-#: src/playgame.c:1021
+#: src/playgame.c:1042
msgid "Fish"
msgstr "മത്സ്യം"
-#: src/playgame.c:1023 src/titlescreen.c:91
+#: src/playgame.c:1044 src/titlescreen.c:91
msgid "Easy"
msgstr "എളുപ്പം"
-#: src/playgame.c:1024 src/titlescreen.c:92
+#: src/playgame.c:1045 src/titlescreen.c:92
msgid "Medium"
msgstr "ഇടത്തരം"
-#: src/playgame.c:1025 src/titlescreen.c:93
+#: src/playgame.c:1046 src/titlescreen.c:93
msgid "Hard"
msgstr "ബുദ്ധിമുട്ടുള്ളത്"
-#: src/playgame.c:1026 src/titlescreen.c:92
+#: src/playgame.c:1047 src/titlescreen.c:92
msgid "Practice"
msgstr "പരിശീലനം"
-#: src/playgame.c:1037
+#: src/playgame.c:1058
msgid "Congratulations"
msgstr "കൊള്ളാലോ!!!"
-#: src/playgame.c:1041
+#: src/playgame.c:1062
msgid "Oh No!"
msgstr "അയ്യോ!.."
Modified: tuxtype/trunk/po/nb.po
===================================================================
--- tuxtype/trunk/po/nb.po 2008-08-23 01:37:51 UTC (rev 667)
+++ tuxtype/trunk/po/nb.po 2008-08-23 11:52:40 UTC (rev 668)
@@ -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-21 17:45-0500\n"
+"POT-Creation-Date: 2008-08-23 06:45-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:1019
+#: src/playgame.c:1040
msgid "Level"
msgstr "Nivå"
-#: src/playgame.c:1020
+#: src/playgame.c:1041
msgid "Lives"
msgstr "Liv"
-#: src/playgame.c:1021
+#: src/playgame.c:1042
msgid "Fish"
msgstr "Fisk"
-#: src/playgame.c:1023 src/titlescreen.c:91
+#: src/playgame.c:1044 src/titlescreen.c:91
msgid "Easy"
msgstr "Lett"
-#: src/playgame.c:1024 src/titlescreen.c:92
+#: src/playgame.c:1045 src/titlescreen.c:92
msgid "Medium"
msgstr "Middels"
-#: src/playgame.c:1025 src/titlescreen.c:93
+#: src/playgame.c:1046 src/titlescreen.c:93
msgid "Hard"
msgstr "Vanskelig"
-#: src/playgame.c:1026 src/titlescreen.c:92
+#: src/playgame.c:1047 src/titlescreen.c:92
msgid "Practice"
msgstr "Øving"
-#: src/playgame.c:1037
+#: src/playgame.c:1058
msgid "Congratulations"
msgstr "Gratulerer!"
-#: src/playgame.c:1041
+#: src/playgame.c:1062
msgid "Oh No!"
msgstr "Uff!"
Modified: tuxtype/trunk/po/ne.po
===================================================================
--- tuxtype/trunk/po/ne.po 2008-08-23 01:37:51 UTC (rev 667)
+++ tuxtype/trunk/po/ne.po 2008-08-23 11:52:40 UTC (rev 668)
@@ -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-21 17:45-0500\n"
+"POT-Creation-Date: 2008-08-23 06:45-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:1019
+#: src/playgame.c:1040
msgid "Level"
msgstr "श्रेणी"
#
-#: src/playgame.c:1020
+#: src/playgame.c:1041
msgid "Lives"
msgstr "जिवनहरु"
#
-#: src/playgame.c:1021
+#: src/playgame.c:1042
msgid "Fish"
msgstr "माछा"
#
-#: src/playgame.c:1023 src/titlescreen.c:91
+#: src/playgame.c:1044 src/titlescreen.c:91
msgid "Easy"
msgstr "सजिलो"
#
-#: src/playgame.c:1024 src/titlescreen.c:92
+#: src/playgame.c:1045 src/titlescreen.c:92
msgid "Medium"
msgstr "मध्यम"
#
-#: src/playgame.c:1025 src/titlescreen.c:93
+#: src/playgame.c:1046 src/titlescreen.c:93
msgid "Hard"
msgstr "कठिन"
#
-#: src/playgame.c:1026 src/titlescreen.c:92
+#: src/playgame.c:1047 src/titlescreen.c:92
msgid "Practice"
msgstr "प्रशिक्षण"
#
-#: src/playgame.c:1037
+#: src/playgame.c:1058
msgid "Congratulations"
msgstr "तपाइलाई बधाई छ!!!"
#
-#: src/playgame.c:1041
+#: src/playgame.c:1062
msgid "Oh No!"
msgstr "हेत्तेरिका!.."
Modified: tuxtype/trunk/po/nl.po
===================================================================
--- tuxtype/trunk/po/nl.po 2008-08-23 01:37:51 UTC (rev 667)
+++ tuxtype/trunk/po/nl.po 2008-08-23 11:52:40 UTC (rev 668)
@@ -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-21 17:45-0500\n"
+"POT-Creation-Date: 2008-08-23 06:45-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:1019
+#: src/playgame.c:1040
msgid "Level"
msgstr "Level"
-#: src/playgame.c:1020
+#: src/playgame.c:1041
msgid "Lives"
msgstr "Levens"
-#: src/playgame.c:1021
+#: src/playgame.c:1042
msgid "Fish"
msgstr "Vissen"
# levels for Cascade game:
-#: src/playgame.c:1023 src/titlescreen.c:91
+#: src/playgame.c:1044 src/titlescreen.c:91
msgid "Easy"
msgstr "Gemakkelijk"
-#: src/playgame.c:1024 src/titlescreen.c:92
+#: src/playgame.c:1045 src/titlescreen.c:92
msgid "Medium"
msgstr "Moeilijker"
-#: src/playgame.c:1025 src/titlescreen.c:93
+#: src/playgame.c:1046 src/titlescreen.c:93
msgid "Hard"
msgstr "Echt Moeilijk"
# general stuff
-#: src/playgame.c:1026 src/titlescreen.c:92
+#: src/playgame.c:1047 src/titlescreen.c:92
msgid "Practice"
msgstr "Vingeroefeningen"
-#: src/playgame.c:1037
+#: src/playgame.c:1058
msgid "Congratulations"
msgstr "Gefeliciteerd !"
-#: src/playgame.c:1041
+#: src/playgame.c:1062
msgid "Oh No!"
msgstr "Oh Nee!"
Modified: tuxtype/trunk/po/nn.po
===================================================================
--- tuxtype/trunk/po/nn.po 2008-08-23 01:37:51 UTC (rev 667)
+++ tuxtype/trunk/po/nn.po 2008-08-23 11:52:40 UTC (rev 668)
@@ -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-21 17:45-0500\n"
+"POT-Creation-Date: 2008-08-23 06:45-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:1019
+#: src/playgame.c:1040
msgid "Level"
msgstr "Nivå"
-#: src/playgame.c:1020
+#: src/playgame.c:1041
msgid "Lives"
msgstr "Liv"
-#: src/playgame.c:1021
+#: src/playgame.c:1042
msgid "Fish"
msgstr "Fisk"
-#: src/playgame.c:1023 src/titlescreen.c:91
+#: src/playgame.c:1044 src/titlescreen.c:91
msgid "Easy"
msgstr "Lett"
-#: src/playgame.c:1024 src/titlescreen.c:92
+#: src/playgame.c:1045 src/titlescreen.c:92
msgid "Medium"
msgstr "Middels"
-#: src/playgame.c:1025 src/titlescreen.c:93
+#: src/playgame.c:1046 src/titlescreen.c:93
msgid "Hard"
msgstr "Vanskeleg"
-#: src/playgame.c:1026 src/titlescreen.c:92
+#: src/playgame.c:1047 src/titlescreen.c:92
msgid "Practice"
msgstr "Øving"
-#: src/playgame.c:1037
+#: src/playgame.c:1058
msgid "Congratulations"
msgstr "Gratulerer!"
-#: src/playgame.c:1041
+#: src/playgame.c:1062
msgid "Oh No!"
msgstr "Uff!"
Modified: tuxtype/trunk/po/pt.po
===================================================================
--- tuxtype/trunk/po/pt.po 2008-08-23 01:37:51 UTC (rev 667)
+++ tuxtype/trunk/po/pt.po 2008-08-23 11:52:40 UTC (rev 668)
@@ -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-21 17:45-0500\n"
+"POT-Creation-Date: 2008-08-23 06:45-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:1019
+#: src/playgame.c:1040
msgid "Level"
msgstr "Nível"
-#: src/playgame.c:1020
+#: src/playgame.c:1041
msgid "Lives"
msgstr "Vidas"
-#: src/playgame.c:1021
+#: src/playgame.c:1042
msgid "Fish"
msgstr "Peixes"
# levels for Cascade game:
-#: src/playgame.c:1023 src/titlescreen.c:91
+#: src/playgame.c:1044 src/titlescreen.c:91
msgid "Easy"
msgstr "Fácil"
-#: src/playgame.c:1024 src/titlescreen.c:92
+#: src/playgame.c:1045 src/titlescreen.c:92
msgid "Medium"
msgstr "Médio"
-#: src/playgame.c:1025 src/titlescreen.c:93
+#: src/playgame.c:1046 src/titlescreen.c:93
msgid "Hard"
msgstr "Difícil"
# general stuff
-#: src/playgame.c:1026 src/titlescreen.c:92
+#: src/playgame.c:1047 src/titlescreen.c:92
msgid "Practice"
msgstr "Praticar"
-#: src/playgame.c:1037
+#: src/playgame.c:1058
msgid "Congratulations"
msgstr "Parabéns"
-#: src/playgame.c:1041
+#: src/playgame.c:1062
msgid "Oh No!"
msgstr "Ah não!"
Modified: tuxtype/trunk/po/ru.po
===================================================================
--- tuxtype/trunk/po/ru.po 2008-08-23 01:37:51 UTC (rev 667)
+++ tuxtype/trunk/po/ru.po 2008-08-23 11:52:40 UTC (rev 668)
@@ -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-21 17:45-0500\n"
+"POT-Creation-Date: 2008-08-23 06:45-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:1019
+#: src/playgame.c:1040
msgid "Level"
msgstr "Уровень"
-#: src/playgame.c:1020
+#: src/playgame.c:1041
msgid "Lives"
msgstr "Жизней"
-#: src/playgame.c:1021
+#: src/playgame.c:1042
msgid "Fish"
msgstr "Рыб"
-#: src/playgame.c:1023 src/titlescreen.c:91
+#: src/playgame.c:1044 src/titlescreen.c:91
msgid "Easy"
msgstr "Легкий"
-#: src/playgame.c:1024 src/titlescreen.c:92
+#: src/playgame.c:1045 src/titlescreen.c:92
msgid "Medium"
msgstr "Средний"
-#: src/playgame.c:1025 src/titlescreen.c:93
+#: src/playgame.c:1046 src/titlescreen.c:93
msgid "Hard"
msgstr "Сложный"
-#: src/playgame.c:1026 src/titlescreen.c:92
+#: src/playgame.c:1047 src/titlescreen.c:92
msgid "Practice"
msgstr "Практика"
-#: src/playgame.c:1037
+#: src/playgame.c:1058
msgid "Congratulations"
msgstr "Поздравляем"
-#: src/playgame.c:1041
+#: src/playgame.c:1062
msgid "Oh No!"
msgstr "О, нет!"
Modified: tuxtype/trunk/po/sv.po
===================================================================
--- tuxtype/trunk/po/sv.po 2008-08-23 01:37:51 UTC (rev 667)
+++ tuxtype/trunk/po/sv.po 2008-08-23 11:52:40 UTC (rev 668)
@@ -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-21 17:45-0500\n"
+"POT-Creation-Date: 2008-08-23 06:45-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:1019
+#: src/playgame.c:1040
msgid "Level"
msgstr "Nivå"
-#: src/playgame.c:1020
+#: src/playgame.c:1041
msgid "Lives"
msgstr "Liv"
-#: src/playgame.c:1021
+#: src/playgame.c:1042
msgid "Fish"
msgstr "Fisk"
# levels for Cascade game:
-#: src/playgame.c:1023 src/titlescreen.c:91
+#: src/playgame.c:1044 src/titlescreen.c:91
msgid "Easy"
msgstr "Lätt"
-#: src/playgame.c:1024 src/titlescreen.c:92
+#: src/playgame.c:1045 src/titlescreen.c:92
msgid "Medium"
msgstr "Mellan"
-#: src/playgame.c:1025 src/titlescreen.c:93
+#: src/playgame.c:1046 src/titlescreen.c:93
msgid "Hard"
msgstr "Svårt"
# general stuff
-#: src/playgame.c:1026 src/titlescreen.c:92
+#: src/playgame.c:1047 src/titlescreen.c:92
msgid "Practice"
msgstr "Övning"
-#: src/playgame.c:1037
+#: src/playgame.c:1058
msgid "Congratulations"
msgstr "Gratulerar"
-#: src/playgame.c:1041
+#: src/playgame.c:1062
msgid "Oh No!"
msgstr "Åh nej!"
Modified: tuxtype/trunk/po/sw.po
===================================================================
--- tuxtype/trunk/po/sw.po 2008-08-23 01:37:51 UTC (rev 667)
+++ tuxtype/trunk/po/sw.po 2008-08-23 11:52:40 UTC (rev 668)
@@ -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-21 17:45-0500\n"
+"POT-Creation-Date: 2008-08-23 06:45-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:1019
+#: src/playgame.c:1040
msgid "Level"
msgstr "Nivel"
-#: src/playgame.c:1020
+#: src/playgame.c:1041
msgid "Lives"
msgstr "Vidas"
-#: src/playgame.c:1021
+#: src/playgame.c:1042
msgid "Fish"
msgstr "Peces"
# levels for Cascade game:
-#: src/playgame.c:1023 src/titlescreen.c:91
+#: src/playgame.c:1044 src/titlescreen.c:91
msgid "Easy"
msgstr "Rahisi"
-#: src/playgame.c:1024 src/titlescreen.c:92
+#: src/playgame.c:1045 src/titlescreen.c:92
msgid "Medium"
msgstr "Ngumu"
-#: src/playgame.c:1025 src/titlescreen.c:93
+#: src/playgame.c:1046 src/titlescreen.c:93
msgid "Hard"
msgstr "Ngumu zaidi"
# general stuff
-#: src/playgame.c:1026 src/titlescreen.c:92
+#: src/playgame.c:1047 src/titlescreen.c:92
msgid "Practice"
msgstr "Jifunze"
-#: src/playgame.c:1037
+#: src/playgame.c:1058
msgid "Congratulations"
msgstr "Shukran"
-#: src/playgame.c:1041
+#: src/playgame.c:1062
msgid "Oh No!"
msgstr "Ahhhh"
Modified: tuxtype/trunk/po/tuxtype.pot
===================================================================
--- tuxtype/trunk/po/tuxtype.pot 2008-08-23 01:37:51 UTC (rev 667)
+++ tuxtype/trunk/po/tuxtype.pot 2008-08-23 11:52:40 UTC (rev 668)
@@ -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-21 17:45-0500\n"
+"POT-Creation-Date: 2008-08-23 06:45-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:1019
+#: src/playgame.c:1040
msgid "Level"
msgstr ""
-#: src/playgame.c:1020
+#: src/playgame.c:1041
msgid "Lives"
msgstr ""
-#: src/playgame.c:1021
+#: src/playgame.c:1042
msgid "Fish"
msgstr ""
-#: src/playgame.c:1023 src/titlescreen.c:91
+#: src/playgame.c:1044 src/titlescreen.c:91
msgid "Easy"
msgstr ""
-#: src/playgame.c:1024 src/titlescreen.c:92
+#: src/playgame.c:1045 src/titlescreen.c:92
msgid "Medium"
msgstr ""
-#: src/playgame.c:1025 src/titlescreen.c:93
+#: src/playgame.c:1046 src/titlescreen.c:93
msgid "Hard"
msgstr ""
-#: src/playgame.c:1026 src/titlescreen.c:92
+#: src/playgame.c:1047 src/titlescreen.c:92
msgid "Practice"
msgstr ""
-#: src/playgame.c:1037
+#: src/playgame.c:1058
msgid "Congratulations"
msgstr ""
-#: src/playgame.c:1041
+#: src/playgame.c:1062
msgid "Oh No!"
msgstr ""
Modified: tuxtype/trunk/po/wo.po
===================================================================
--- tuxtype/trunk/po/wo.po 2008-08-23 01:37:51 UTC (rev 667)
+++ tuxtype/trunk/po/wo.po 2008-08-23 11:52:40 UTC (rev 668)
@@ -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-21 17:45-0500\n"
+"POT-Creation-Date: 2008-08-23 06:45-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:1019
+#: src/playgame.c:1040
msgid "Level"
msgstr "Tollu tollu"
-#: src/playgame.c:1020
+#: src/playgame.c:1041
msgid "Lives"
msgstr "Dund yi"
-#: src/playgame.c:1021
+#: src/playgame.c:1042
msgid "Fish"
msgstr "Jën yi"
# levels for Cascade game:
-#: src/playgame.c:1023 src/titlescreen.c:91
+#: src/playgame.c:1044 src/titlescreen.c:91
msgid "Easy"
msgstr "Yomb"
-#: src/playgame.c:1024 src/titlescreen.c:92
+#: src/playgame.c:1045 src/titlescreen.c:92
msgid "Medium"
msgstr "Ci diggante bi"
-#: src/playgame.c:1025 src/titlescreen.c:93
+#: src/playgame.c:1046 src/titlescreen.c:93
msgid "Hard"
msgstr "Dëgër"
# general stuff
-#: src/playgame.c:1026 src/titlescreen.c:92
+#: src/playgame.c:1047 src/titlescreen.c:92
msgid "Practice"
msgstr "Jëf ji"
-#: src/playgame.c:1037
+#: src/playgame.c:1058
msgid "Congratulations"
msgstr "Waaw góor"
-#: src/playgame.c:1041
+#: src/playgame.c:1062
msgid "Oh No!"
msgstr "Déedéet!"
Modified: tuxtype/trunk/src/funcs.h
===================================================================
--- tuxtype/trunk/src/funcs.h 2008-08-23 01:37:51 UTC (rev 667)
+++ tuxtype/trunk/src/funcs.h 2008-08-23 11:52:40 UTC (rev 668)
@@ -86,7 +86,7 @@
SDL_Surface* LoadImage(const char* datafile, int mode);
int LoadBothBkgds(const char* datafile);
SDL_Surface* CurrentBkgd(void);
-void UnloadBkgds(void);
+void FreeBothBkgds(void);
void LoadLang(void);
Mix_Music* LoadMusic(const char* datafile);
Mix_Chunk* LoadSound(const char* datafile);
Modified: tuxtype/trunk/src/laser.c
===================================================================
--- tuxtype/trunk/src/laser.c 2008-08-23 01:37:51 UTC (rev 667)
+++ tuxtype/trunk/src/laser.c 2008-08-23 11:52:40 UTC (rev 668)
@@ -624,7 +624,7 @@
/* Free backgrounds: */
- UnloadBkgds();
+ FreeBothBkgds();
/* Stop music: */
if ((settings.sys_sound) && (Mix_PlayingMusic()))
@@ -776,7 +776,7 @@
LOG("Will try to load file:");
LOG(fname);
- UnloadBkgds();
+ FreeBothBkgds(); // LoadBothBkgds() actually does this just in case
LoadBothBkgds(fname);
Modified: tuxtype/trunk/src/loaders.c
===================================================================
--- tuxtype/trunk/src/loaders.c 2008-08-23 01:37:51 UTC (rev 667)
+++ tuxtype/trunk/src/loaders.c 2008-08-23 11:52:40 UTC (rev 668)
@@ -332,7 +332,7 @@
SDL_Surface* orig = NULL;
//Avoid memory leak in case something else already loaded:
- UnloadBkgds();
+ FreeBothBkgds();
LOG("Entering LoadBothBkgds()\n");
@@ -385,7 +385,7 @@
return win_bkgd;
}
-void UnloadBkgds(void)
+void FreeBothBkgds(void)
{
if (win_bkgd)
SDL_FreeSurface(win_bkgd);
Modified: tuxtype/trunk/src/playgame.c
===================================================================
--- tuxtype/trunk/src/playgame.c 2008-08-23 01:37:51 UTC (rev 667)
+++ tuxtype/trunk/src/playgame.c 2008-08-23 11:52:40 UTC (rev 668)
@@ -34,7 +34,7 @@
//int o_lives; // something cal is working on
//int sound_vol;
static TTF_Font* font = NULL;
-static SDL_Surface* background = NULL;
+//static SDL_Surface* background = NULL;
static SDL_Surface* level[NUM_LEVELS] = {NULL};
static SDL_Surface* number[NUM_NUMS] = {NULL};
static SDL_Surface* curlev = NULL;
@@ -76,7 +76,7 @@
static int DrawObject(SDL_Surface* surf, int x, int y);
static int DrawSprite(sprite* gfx, int x, int y);
static void EraseNumbers(int num, int x, int y, int places);
-static int EraseObject(SDL_Surface* sprite, int x, int y);
+static int EraseObject(SDL_Surface* surf, int x, int y);
static int EraseSprite(sprite* img, int x, int y);
static float float_restrict(float a, float x, float b);
static void FreeGame(void);
@@ -208,7 +208,8 @@
if (curlevel != 0)
{
- SDL_FreeSurface(background);
+ FreeBothBkgds();
+ //SDL_FreeSurface(background);
}
if (diflevel == INF_PRACT)
@@ -225,8 +226,8 @@
{
fprintf(stderr, "->>Loading background: %s\n", filename);
}
-
- background = LoadImage( filename, IMG_REGULAR );
+ LoadBothBkgds(filename);
+// background = LoadImage( filename, IMG_REGULAR );
// SNOW_setBkg( background );
DrawBackground();
@@ -257,11 +258,13 @@
/* --- 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)
@@ -333,9 +336,11 @@
/* Now update with case-folded value: */
UpdateTux(key_unicode, fishies, frame);
}
+ }
+ } /* ------ End of 'while' loop for handling user input ------- */
- /* ---------- Done handling user input ----------- */
+
/* --- fishy updates --- */
if ((frame % 10) == 0)
NEXT_FRAME(fishy);
@@ -376,6 +381,7 @@
if (!quitting)
{
+ /* This does all the blits that we have queued up this frame: */
UpdateScreen(&frame);
if (!settings.speed_up)
@@ -734,30 +740,33 @@
ResetObjects : Clear and reset all objects to dead
****************************************************/
-static void ResetObjects( void ) {
- int i;
+static void ResetObjects(void)
+{
+ int i;
- LOG( "RESETTING OBJECTS\n" );
+ LOG("RESETTING OBJECTS\n");
- for (i = 0; i < MAX_FISHIES_HARD + 1; i++) {
- fish_object[i] = null_fishy;
- splat_object[i] = null_splat;
- }
+ for (i = 0; i < MAX_FISHIES_HARD + 1; i++)
+ {
+ fish_object[i] = null_fishy;
+ splat_object[i] = null_splat;
+ }
- tux_object.facing = RIGHT;
- tux_object.x = screen->w / 2;
- tux_object.y = screen->h - tux_object.spr[0][RIGHT]->frame[0]->h - 1;
- tux_object.dx = 0;
- tux_object.dy = 0;
- tux_object.endx = tux_object.x;
- tux_object.endy = tux_object.y;
- tux_object.state = TUX_STANDING;
- tux_object.word[0] = 0;
- tux_object.wordlen = 0;
+ tux_object.facing = RIGHT;
+ tux_object.x = screen->w/2;
+ tux_object.y = screen->h - tux_object.spr[0][RIGHT]->frame[0]->h - 1;
+ tux_object.dx = 0;
+ tux_object.dy = 0;
+ tux_object.endx = tux_object.x;
+ tux_object.endy = tux_object.y;
+ tux_object.state = TUX_STANDING;
+ tux_object.word[0] = 0;
+ tux_object.wordlen = 0;
- LOG( "OBJECTS RESET\n" );
+ LOG( "OBJECTS RESET\n" );
}
+
static int DrawSprite(sprite* gfx, int x, int y)
{
struct blit* update;
@@ -872,46 +881,27 @@
LOG("Leaving UpdateScreen()\n");
}
+
+/* basically puts in an order to overdraw sprite with corresponding */
+/* rect of bkgd img */
static int EraseSprite(sprite* img, int x, int y)
{
struct blit* update;
- if(!img)
+ if( !img
+ || img->cur < 0
+ || img->cur > MAX_SPRITE_FRAMES
+ || !img->frame[img->cur])
{
fprintf(stderr, "EraseSprite() - invalid 'img' arg!\n");
return 0;
}
- update = &blits[numupdates++];
+ return EraseObject(img->frame[img->cur], x, y);
+}
- if(!update || !update->srcrect || !update->dstrect)
- {
- fprintf(stderr, "EraseSprite() - 'update' ptr invalid!\n");
- return 0;
- }
- update->src = background;
- update->srcrect->x = x;
- update->srcrect->y = y;
- update->srcrect->w = img->frame[img->cur]->w;
- update->srcrect->h = img->frame[img->cur]->h;
- /* check to see if we are trying blit data that doesn't exist!!! */
-
- if (update->srcrect->x + update->srcrect->w > background->w)
- update->srcrect->w = background->w - update->srcrect->x;
- if (update->srcrect->y + update->srcrect->h > background->h)
- update->srcrect->h = background->h - update->srcrect->y;
-
- update->dstrect->x = x;
- update->dstrect->y = y;
- update->dstrect->w = update->srcrect->w;
- update->dstrect->h = update->srcrect->h;
- update->type = 'E';
-
- return 1;
-}
-
/*************************
EraseObject : Erase an object from the screen
**************************/
@@ -933,18 +923,19 @@
return 0;
}
- update->src = background;
+ update->src = CurrentBkgd();
+// update->src = background;
update->srcrect->x = x;
update->srcrect->y = y;
update->srcrect->w = surf->w;
update->srcrect->h = surf->h;
- /* check to see if we are trying blit data that doesn't exist!!! */
+ /* (reduce width or height of srcrect so it doesn't go past bkgd) */
+ if (update->srcrect->x + update->srcrect->w > CurrentBkgd()->w)
+ update->srcrect->w = CurrentBkgd()->w - update->srcrect->x;
+ if (update->srcrect->y + update->srcrect->h > CurrentBkgd()->h)
+ update->srcrect->h = CurrentBkgd()->h - update->srcrect->y;
- if (update->srcrect->x + update->srcrect->w > background->w)
- update->srcrect->w = background->w - update->srcrect->x;
- if (update->srcrect->y + update->srcrect->h > background->h)
- update->srcrect->h = background->h - update->srcrect->y;
update->dstrect->x = x;
update->dstrect->y = y;
@@ -1205,69 +1196,85 @@
***********************/
static void FreeGame(void)
{
- int i;
+ int i;
- FreeLetters();
+ FreeLetters();
- TTF_CloseFont(font);
- font = NULL;
+ if (font)
+ TTF_CloseFont(font);
+ font = NULL;
- LOG( "FreeGame():\n-Freeing Tux Animations\n" );
+ LOG( "FreeGame():\n-Freeing Tux Animations\n" );
- for ( i=0; i < TUX_NUM_STATES; i++ ) {
- FreeSprite(tux_object.spr[i][RIGHT]);
- FreeSprite(tux_object.spr[i][LEFT]);
- tux_object.spr[i][RIGHT] = NULL;
- tux_object.spr[i][LEFT] = NULL;
- }
+ for (i = 0; i < TUX_NUM_STATES; i++ )
+ {
+ if (tux_object.spr[i][RIGHT])
+ FreeSprite(tux_object.spr[i][RIGHT]);
+ tux_object.spr[i][RIGHT] = NULL;
- LOG( "-Freeing fishies\n" );
+ if (tux_object.spr[i][LEFT])
+ FreeSprite(tux_object.spr[i][LEFT]);
+ tux_object.spr[i][LEFT] = NULL;
+ }
- FreeSprite( fishy );
- FreeSprite( splat );
- fishy = splat = NULL;
+ LOG( "-Freeing fishies\n" );
- LOG( "-Freeing other game graphics\n" );
+ if (fishy)
+ FreeSprite(fishy);
+ if (splat)
+ FreeSprite(splat);
+ fishy = splat = NULL;
- SDL_FreeSurface(background);
- SDL_FreeSurface(curlev);
- SDL_FreeSurface(fish);
- SDL_FreeSurface(lives);
- background = curlev = fish = lives = NULL;
+ LOG( "-Freeing other game graphics\n" );
- for (i = 0; i < NUM_LEVELS; i++)
- {
- SDL_FreeSurface(level[i]);
- level[i] = NULL;
- }
- for (i = 0; i < NUM_NUMS; i++)
- {
- SDL_FreeSurface(number[i]);
- number[i] = NULL;
- }
- for (i = 0; i < CONGRATS_FRAMES; i++)
- {
- SDL_FreeSurface(congrats[i]);
- congrats[i] = NULL;
- }
- for (i = 0; i < OH_NO_FRAMES; i++)
- {
- SDL_FreeSurface(ohno[i]);
- ohno[i] = NULL;
- }
- if (settings.sys_sound) {
- LOG( "-Freeing sound\n" );
- for (i = 0; i < NUM_WAVES; ++i)
- {
- Mix_FreeChunk(sound[i]);
- sound[i] = NULL;
- }
- }
+ FreeBothBkgds();
-// PauseUnloadMedia();
+ if (curlev)
+ SDL_FreeSurface(curlev);
+ if (fish)
+ SDL_FreeSurface(fish);
+ if (lives)
+ SDL_FreeSurface(lives);
+ curlev = fish = lives = NULL;
+ for (i = 0; i < NUM_LEVELS; i++)
+ {
+ if (level[i])
+ SDL_FreeSurface(level[i]);
+ level[i] = NULL;
+ }
+ for (i = 0; i < NUM_NUMS; i++)
+ {
+ if (number[i])
+ SDL_FreeSurface(number[i]);
+ number[i] = NULL;
+ }
+ for (i = 0; i < CONGRATS_FRAMES; i++)
+ {
+ if (congrats[i])
+ SDL_FreeSurface(congrats[i]);
+ congrats[i] = NULL;
+ }
+ for (i = 0; i < OH_NO_FRAMES; i++)
+ {
+ if (ohno[i])
+ SDL_FreeSurface(ohno[i]);
+ ohno[i] = NULL;
+ }
+ if (settings.sys_sound)
+ {
+ LOG( "-Freeing sound\n" );
+ for (i = 0; i < NUM_WAVES; ++i)
+ {
+ if (sound[i])
+ Mix_FreeChunk(sound[i]);
+ sound[i] = NULL;
+ }
+ }
- LOG( "FreeGame(): END\n" );
+// PauseUnloadMedia();
+
+ LOG( "FreeGame(): END\n" );
}
/***************************
@@ -1286,12 +1293,12 @@
numupdates=0; // drawing entire background writes over all other stuff, so don't draw them
update = &blits[numupdates++];
- update->src = background;
+ update->src = CurrentBkgd();
update->srcrect->x = update->dstrect->x = 0;
update->srcrect->y = update->dstrect->y = 0;
- update->srcrect->w = update->dstrect->w = background->w;
- update->srcrect->h = update->dstrect->h = background->h;
+ update->srcrect->w = update->dstrect->w = update->src->w;
+ update->srcrect->h = update->dstrect->h = update->src->h;
update->type = 'D';
}
Modified: tuxtype/trunk/src/titlescreen.c
===================================================================
--- tuxtype/trunk/src/titlescreen.c 2008-08-23 01:37:51 UTC (rev 667)
+++ tuxtype/trunk/src/titlescreen.c 2008-08-23 11:52:40 UTC (rev 668)
@@ -1143,7 +1143,7 @@
speakeroff = NULL;
}
- UnloadBkgds();
+ FreeBothBkgds();
if (Tux)
{
More information about the Tux4kids-commits
mailing list