* Added "Id" attribute to a few files lacking it

* Non-existent level files are simply not added to worldmap
* A few fixes to a few level files
* Update of Czech translations

SVN-Revision: 2968

diff --git a/data/cs.po b/data/cs.po
index f8c2d1e..95c5e86 100644 (file)
--- a/data/cs.po
+++ b/data/cs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SuperTux 0.2\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2005-11-03 13:39+0100\n"
+"PO-Revision-Date: 2005-12-31 13:34+0100\n"
 "Last-Translator: Ondřej Hošek <ondra.hosek@gmail.com>\n"
 "Language-Team: Czech\n"
 "MIME-Version: 1.0\n"

diff --git a/data/levels/bonus1/cs.po b/data/levels/bonus1/cs.po
index fe1f0c3..6f5dd7a 100644 (file)
--- a/data/levels/bonus1/cs.po
+++ b/data/levels/bonus1/cs.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SuperTux 0.2\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2005-11-03 13:15+0100\n"
+"PO-Revision-Date: 2005-12-31 13:30+0100\n"
 "Last-Translator: Ondřej Hošek <ondra.hosek@gmail.com>\n"
 "Language-Team: Czech\n"
 "MIME-Version: 1.0\n"

diff --git a/data/levels/bonus2/cs.po b/data/levels/bonus2/cs.po
index f680fea..927333e 100644 (file)
--- a/data/levels/bonus2/cs.po
+++ b/data/levels/bonus2/cs.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SuperTux 0.2\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2005-11-03 13:15+0100\n"
+"PO-Revision-Date: 2005-12-31 13:30+0100\n"
 "Last-Translator: Ondřej Hošek <ondra.hosek@gmail.com>\n"
 "Language-Team: Czech\n"
 "MIME-Version: 1.0\n"

diff --git a/data/levels/test/door_beta.stl b/data/levels/test/door_beta.stl
index 8ac78f6..07f7148 100644 (file)
--- a/data/levels/test/door_beta.stl
+++ b/data/levels/test/door_beta.stl
@@ -119,16 +119,16 @@
        (spidermite (x 86) (y 356))
       (infoblock (x 736) (y 192)
         (message (_ "!images/objects/voicemail/voicemail.png
-_Hey Tux,
-_Some friends have 
-_left you voicemail 
-_messages with advice
-_to find Penny. So 
-_don't forget to check
-_your voicemail and 
-_good luck!
-_
-_The SuperTux Team"))
+#Hey Tux,
+#Some friends have 
+#left you voicemail 
+#messages with advice
+#to find Penny. So 
+#don't forget to check
+#your voicemail and 
+#good luck!
+#The SuperTux Team"))
+
       )
        (poisonivy (x 112) (y 611))
         (secretarea (x 460.5625)

diff --git a/data/levels/test/yeti.stl b/data/levels/test/yeti.stl
index f317c93..0c2635e 100644 (file)
--- a/data/levels/test/yeti.stl
+++ b/data/levels/test/yeti.stl
@@ -111,7 +111,7 @@ Sound.play(\"sounds/invincible.wav\");
 Text.set_text(\"You Made It BIG TIME!\");
 Text.set_font(\"big\");
 Text.fade_in(1.5);
-wait(4);
+wait(6);
 DisplayEffect.fade_out(1.5);
 wait(1.5);
 

diff --git a/data/levels/world1/cs.po b/data/levels/world1/cs.po
index 1160850..ce7db59 100644 (file)
--- a/data/levels/world1/cs.po
+++ b/data/levels/world1/cs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SuperTux 0.2\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2005-11-03 13:33+0100\n"
+"PO-Revision-Date: 2005-12-31 13:30+0100\n"
 "Last-Translator: Ondřej Hošek <ondra.hosek@gmail.com>\n"
 "Language-Team: Czech\n"
 "MIME-Version: 1.0\n"

diff --git a/data/levels/world2/cs.po b/data/levels/world2/cs.po
index 6f56f33..5b9d836 100644 (file)
--- a/data/levels/world2/cs.po
+++ b/data/levels/world2/cs.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SuperTux 0.2\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2005-11-03 13:34+0100\n"
+"PO-Revision-Date: 2005-12-31 13:33+0100\n"
 "Last-Translator: Ondřej Hošek <ondra.hosek@gmail.com>\n"
 "Language-Team: Czech\n"
 "MIME-Version: 1.0\n"
@@ -62,7 +62,7 @@ msgstr "Dolů králičí norou"
 msgid "Drink me"
 msgstr "Vypij mne"
 
-#: data/levels/world2/level2.stl:222
+#: data/levels/world2/level2.stl:224
 msgid ""
 "-Oh no!\n"
 "#The path is blocked! It\n"
@@ -76,11 +76,11 @@ msgstr ""
 "#cesta, která vede dál,\n"
 "#je touto dírou dolů..."
 
-#: data/levels/world2/level2.stl:246
+#: data/levels/world2/level2.stl:248
 msgid "Eat me"
 msgstr "Sněz mne"
 
-#: data/levels/world2/level2.stl:248
+#: data/levels/world2/level2.stl:250
 msgid "-Are you lost?"
 msgstr "-Ztratil ses?"
 
@@ -100,17 +100,31 @@ msgstr "Beze jména"
 msgid "Forest Level 1"
 msgstr "Lesní úroveň 1"
 
-#: data/levels/world2/castle1.stl:4
-msgid "Nolok's Hallway"
-msgstr "Nolokova chodba"
+#: data/levels/world2/castledoor.stl:4
+msgid "Find The Pay Phone"
+msgstr "Najdi telefonní budku"
 
-#: data/levels/world2/castle1.stl:294
+#: data/levels/world2/castledoor.stl:300
 msgid ""
+"!images/objects/voicemail/voicemail.png\n"
+"#Hey Tux,\n"
+"#Some friends have \n"
+"#left you voicemail \n"
+"#messages with advice\n"
+"#to find Penny. So \n"
+"#don't forget to check\n"
+"#your voicemail and \n"
+"#good luck!\n"
 "\n"
-"!images/credits/milestone.png\n"
-" VoiceMail message here"
+"#The SuperTux Team"
 msgstr ""
+"!images/objects/voicemail/voicemail.png\n"
+"#Ahoj Tuxi,\n"
+"#Pár přátel ti zanechalo\n"
+"#hlasové zprávy s radami\n"
+"#k osvobození Penny.\n"
+"#Nezapomeň je kontrolovat!\n"
+"#Hodně štěstí!\n"
 "\n"
-"!images/credits/milestone.png\n"
-" Zprávu hlasové schránky sem"
+"#Tým SuperTux"
 

diff --git a/data/locale/cs.po b/data/locale/cs.po
index 211dfee..6973a11 100644 (file)
--- a/data/locale/cs.po
+++ b/data/locale/cs.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: SuperTux 0.2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2005-05-16 13:28+0200\n"
-"PO-Revision-Date: 2005-11-03 13:37+0100\n"
+"PO-Revision-Date: 2005-12-31 13:34+0100\n"
 "Last-Translator: Ondřej Hošek <ondra.hosek@gmail.com>\n"
 "Language-Team: Czech\n"
 "MIME-Version: 1.0\n"
@@ -16,17 +16,17 @@ msgstr ""
 "X-Poedit-Language: Czech\n"
 "X-Poedit-Country: CZECH REPUBLIC\n"
 
-#: src/worldmap.cpp:816
+#: src/worldmap.cpp:827
 msgid "GAMEOVER"
 msgstr "KONEC HRY"
 
-#: src/worldmap.cpp:819
+#: src/worldmap.cpp:830
 #: src/game_session.cpp:765
 #, c-format
 msgid "COINS: %d"
 msgstr "MINCE: %d"
 
-#: src/worldmap.cpp:824
+#: src/worldmap.cpp:835
 msgid "Total Statistics"
 msgstr "Celková statistika"
 
@@ -66,7 +66,7 @@ msgstr ""
 msgid "Are you sure you want to delete slot"
 msgstr "Opravdu chcete smazat uloženou hru"
 
-#: src/main.cpp:184
+#: src/main.cpp:183
 #, c-format
 msgid ""
 "Usage: %s [OPTIONS] LEVELFILE\n"
@@ -75,7 +75,7 @@ msgstr ""
 "Použití: %s [NASTAVENÍ] SOUBOR_ÚROVNĚ\n"
 "\n"
 
-#: src/main.cpp:186
+#: src/main.cpp:185
 #, c-format
 msgid ""
 "Options:\n"

diff --git a/src/worldmap.cpp b/src/worldmap.cpp
index 257cbc8..dd57ce9 100644 (file)
--- a/src/worldmap.cpp
+++ b/src/worldmap.cpp
@@ -529,6 +529,17 @@ WorldMap::parse_level_tile(const lisp::Lisp* level_lisp)
   level_lisp->get("quit-worldmap", level.quit_worldmap);
 
   level_lisp->get("name", level.name);
+  
+  if (!PHYSFS_exists((levels_path + level.name).c_str()))
+  {
+       // Do we want to bail out instead...? We might get messages from modders
+       // who can't make their levels run because they're too dumb to watch
+       // their terminals...
+    std::cerr << "Error: level file '" << level.name
+      << "' does not exist and will not be added to the worldmap." << std::endl;
+    return;
+  }
+
   level_lisp->get("x", level.pos.x);
   level_lisp->get("y", level.pos.y);