From cf3ee74c3cdbef06575891b454804b5f6f782de0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ond=C5=99ej=20Ho=C5=A1ek?= Date: Mon, 10 Oct 2005 18:41:49 +0000 Subject: [PATCH] * Updated Czech translation * Added/fixed write functions for badguys so that they are usable for converting between level format versions SVN-Revision: 2828 --- data/cs.po | 104 ++++++++++++++++++---------------- data/levels/bonus1/cs.po | 28 +++++----- data/levels/world1/cs.po | 2 +- data/levels/world2/cs.po | 98 ++++++++++++++++++++++++++++++++ data/locale/cs.po | 124 ++++++++++++++++++++++------------------- src/badguy/badguy.cpp | 6 ++ src/badguy/badguy.hpp | 5 ++ src/badguy/kugelblitz.cpp | 1 - src/badguy/rocketexplosion.cpp | 2 +- src/badguy/snowball.cpp | 4 ++ src/badguy/yeti.cpp | 10 ++++ src/badguy/yeti_stalactite.cpp | 9 +++ src/badguy/yeti_stalactite.hpp | 1 + 13 files changed, 273 insertions(+), 121 deletions(-) create mode 100644 data/levels/world2/cs.po diff --git a/data/cs.po b/data/cs.po index 9c37d7566..f3f62bb4b 100644 --- a/data/cs.po +++ b/data/cs.po @@ -6,79 +6,84 @@ msgid "" msgstr "" "Project-Id-Version: SuperTux 0.2\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2005-05-15 14:52+0100\n" +"PO-Revision-Date: 2005-10-10 18:28+0100\n" "Last-Translator: Ondřej Hošek \n" "Language-Team: Czech\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Czech\n" +"X-Poedit-Country: CZECH REPUBLIC\n" -#: data/credits.txt:6 +#: credits.txt:6 msgid "" -"-- SuperTux -\n" -"\tMilestone 2\n" +"!images/credits/milestone.png\n" "\n" "\n" -"-Maintainer\n" -"\n" -"\tTobias (tobgle) Glaesser\n" "\n" "\n" "-Original Developer\n" "\n" "\tBill Kendrick\n" +"!images/credits/bill.jpg\n" "\n" "\n" "-Programming\n" "\n" -"\tTobias (tobgle) Glaesser\n" +"\tMatthias \"MatzeB\" Braun\n" +"!images/credits/matze.jpg\n" +"\n" +"\tTobias \"tobgle\" Glaesser\n" +"\n" +"\tRicardo \"blacksheep\" Cruz\n" +"\n" +"\tIngo \"grumbel\" Ruhnke\n" "\n" -"\tRicardo (blacksheep) Cruz\n" -" \n" -"\tIngo (grumbel) Ruhnke\n" -" \n" -"\tMatthias (MatzeB) Braun\n" +"\tRyan \"sik0fewl\" Flegel\n" "\n" -"\tRyan (sik0fewl) Flegel\n" +"\tBastiaan \"basti_\" Zapf\n" "\n" -"\tBastiaan (basti_) Zapf\n" +"\tMarek \"Wansti\" Moeckel\n" "\n" "\n" "-Contrib Programming\n" "\n" -"\tDuong-Khang (neoneurone) NGUYEN\n" +"\tDuong-Khang \"neoneurone\" NGUYEN\n" "\n" "\tRichard Smith\n" "\n" -"\tOndra (Ravu al Hemio) Hosek\n" +"\tOndra \"Ravu al Hemio\" Hosek\n" "\n" "\n" "-Graphics\n" "\n" -"\tIngo (grumbel) Ruhnke\n" -" \n" -"\tChristopher A. (paroneayea) Webber\n" +"\tIngo \"grumbel\" Ruhnke\n" +"!images/credits/ingo.jpg\n" "\n" -"\tBenjamin P. (litespeed) Jung\n" +"\tChristopher A. \"paroneayea\" Webber\n" +"\n" +"\tBenjamin P. \"litespeed\" Jung\n" "\n" "\tStephen Groundwater\n" +"!images/credits/gwater.jpg\n" "\n" "\n" "-Level Design\n" "\n" -"\tMarek (Wansti) Moeckel\n" -" \n" -"\tIngo (grumbel) Ruhnke\n" +"\tMarek \"Wansti\" Moeckel\n" +"!images/credits/wansti.jpg\n" +"\n" +"\tIngo \"grumbel\" Ruhnke\n" "\n" "\n" "-Story\n" "\n" -"\tChristopher A. (paroneayea) Webber\n" +"\tChristopher A. \"paroneayea\" Webber\n" "\n" "\n" "-Music\n" "\n" -"\tMarek (Wansti) Moeckel\n" +"\tMarek \"Wansti\" Moeckel\n" "\n" "\tMystical\n" "\n" @@ -139,72 +144,75 @@ msgid "" "\n" "\n" "\n" -"\tSee you soon in Milestone 3!" +"\tPenny awaits you in Milestone 3!" msgstr "" -"-- SuperTux -\n" -"\tDruhý milník\n" +"!images/credits/milestone.png\n" "\n" "\n" -"-Udržovatel\n" -"\n" -"\tTobias (tobgle) Glaesser\n" "\n" "\n" "-Původní vývojář\n" "\n" "\tBill Kendrick\n" +"!images/credits/bill.jpg\n" "\n" "\n" "-Programování\n" "\n" -"\tTobias (tobgle) Glaesser\n" +"\tMatthias \"MatzeB\" Braun\n" +"!images/credits/matze.jpg\n" +"\n" +"\tTobias \"tobgle\" Glaesser\n" "\n" -"\tRicardo (blacksheep) Cruz\n" +"\tRicardo \"blacksheep\" Cruz\n" "\n" -"\tIngo (grumbel) Ruhnke\n" +"\tIngo \"grumbel\" Ruhnke\n" "\n" -"\tMatthias (MatzeB) Braun\n" +"\tRyan \"sik0fewl\" Flegel\n" "\n" -"\tRyan (sik0fewl) Flegel\n" +"\tBastiaan \"basti_\" Zapf\n" "\n" -"\tBastiaan (basti_) Zapf\n" +"\tMarek \"Wansti\" Moeckel\n" "\n" "\n" "-Dodatečné programování\n" "\n" -"\tDuong-Khang (neoneurone) NGUYEN\n" +"\tDuong-Khang \"neoneurone\" NGUYEN\n" "\n" "\tRichard Smith\n" "\n" -"\tOndra (Ravu al Hemio) Hošek\n" +"\tOndra \"Ravu al Hemio\" Hošek\n" "\n" "\n" "-Grafika\n" "\n" -"\tIngo (grumbel) Ruhnke\n" +"\tIngo \"grumbel\" Ruhnke\n" +"!images/credits/ingo.jpg\n" "\n" -"\tChristopher A. (paroneayea) Webber\n" +"\tChristopher A. \"paroneayea\" Webber\n" "\n" -"\tBenjamin P. (litespeed) Jung\n" +"\tBenjamin P. \"litespeed\" Jung\n" "\n" "\tStephen Groundwater\n" +"!images/credits/gwater.jpg\n" "\n" "\n" "-Úrovně\n" "\n" -"\tMarek (Wansti) Moeckel\n" +"\tMarek \"Wansti\" Moeckel\n" +"!images/credits/wansti.jpg\n" "\n" -"\tIngo (grumbel) Ruhnke\n" +"\tIngo \"grumbel\" Ruhnke\n" "\n" "\n" "-Příběh\n" "\n" -"\tChristopher A. (paroneayea) Webber\n" +"\tChristopher A. \"paroneayea\" Webber\n" "\n" "\n" "-Hudba\n" "\n" -"\tMarek (Wansti) Moeckel\n" +"\tMarek \"Wansti\" Moeckel\n" "\n" "\tMystical\n" "\n" @@ -265,5 +273,5 @@ msgstr "" "\n" "\n" "\n" -"\tNa shledanou u třetího milníku!" +"\tV třetím milníku na vás čeká Penny!" diff --git a/data/levels/bonus1/cs.po b/data/levels/bonus1/cs.po index 9a3614464..12bd63735 100644 --- 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-05-13 16:29+0100\n" +"PO-Revision-Date: 2005-10-10 18:15+0100\n" "Last-Translator: Ondřej Hošek \n" "Language-Team: Czech\n" "MIME-Version: 1.0\n" @@ -72,55 +72,55 @@ msgstr "Lháři!" msgid "Train Leaves in One Minute" msgstr "Vlak odjíždí za minutu" -#: data/levels/bonus1/worldmap.stwm:133 +#: data/levels/bonus1/worldmap.stwm:136 msgid "You found a secret place!" msgstr "Našel jsi tajné místo!" -#: data/levels/bonus1/worldmap.stwm:140 +#: data/levels/bonus1/worldmap.stwm:143 msgid "Hint: Use igloos to get back here." msgstr "Tip: použij iglú k návratu." -#: data/levels/bonus1/worldmap.stwm:147 +#: data/levels/bonus1/worldmap.stwm:150 msgid "Warp to Matr1x' Sector" msgstr "Přenést se do Matr1xova sektoru" -#: data/levels/bonus1/worldmap.stwm:154 +#: data/levels/bonus1/worldmap.stwm:157 msgid "Warp to Thompson's Domain" msgstr "Přenést se do Thompsonovy domény" -#: data/levels/bonus1/worldmap.stwm:161 +#: data/levels/bonus1/worldmap.stwm:164 msgid "Warp to the SuperTux Team Island" msgstr "Přenést se na ostrov týmu SuperTux" -#: data/levels/bonus1/worldmap.stwm:168 +#: data/levels/bonus1/worldmap.stwm:171 msgid "Warp to Abednego's Area" msgstr "Přenést se do Abendnegova pole" -#: data/levels/bonus1/worldmap.stwm:175 +#: data/levels/bonus1/worldmap.stwm:178 msgid "Warp to Torfi's Territory" msgstr "Přenést se do Torfiho teritoria" -#: data/levels/bonus1/worldmap.stwm:182 +#: data/levels/bonus1/worldmap.stwm:185 msgid "Leave Matrix' Sector" msgstr "Opustit Matr1xův sektor" -#: data/levels/bonus1/worldmap.stwm:189 +#: data/levels/bonus1/worldmap.stwm:192 msgid "Leave Thompson's Domain" msgstr "Opustit Thompsonovu doménu" -#: data/levels/bonus1/worldmap.stwm:196 +#: data/levels/bonus1/worldmap.stwm:199 msgid "Leave SuperTux Team Island" msgstr "Opustit ostrov týmu SuperTux" -#: data/levels/bonus1/worldmap.stwm:203 +#: data/levels/bonus1/worldmap.stwm:206 msgid "Leave Abednego's Area" msgstr "Opustit Abendnegovo pole" -#: data/levels/bonus1/worldmap.stwm:210 +#: data/levels/bonus1/worldmap.stwm:213 msgid "Leave Torfi's Territory" msgstr "Opustit Torfiho teritorium" -#: data/levels/bonus1/worldmap.stwm:217 +#: data/levels/bonus1/worldmap.stwm:220 msgid "Warp home" msgstr "Přenést se domů" diff --git a/data/levels/world1/cs.po b/data/levels/world1/cs.po index 713eb9b0f..9f9e928ce 100644 --- 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-05-13 20:58+0100\n" +"PO-Revision-Date: 2005-10-10 18:16+0100\n" "Last-Translator: Ondřej Hošek \n" "Language-Team: Czech\n" "MIME-Version: 1.0\n" diff --git a/data/levels/world2/cs.po b/data/levels/world2/cs.po new file mode 100644 index 000000000..1bca7e82f --- /dev/null +++ b/data/levels/world2/cs.po @@ -0,0 +1,98 @@ +msgid "" +msgstr "" +"Project-Id-Version: SuperTux 0.2\n" +"POT-Creation-Date: \n" +"PO-Revision-Date: 2005-10-10 18:40+0100\n" +"Last-Translator: Ondřej Hošek \n" +"Language-Team: Czech\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Czech\n" +"X-Poedit-Country: CZECH REPUBLIC\n" + +#: data/levels/world2/dfk-level2.stl:4 +msgid "Dark Forest Keep - The Evil Chamber" +msgstr "Hrad v Tmavém Lese - Komnata zla" + +#: data/levels/world2/dfk-level3.stl:4 +msgid "Dark Forest Keep - The Black Tower" +msgstr "Hrad v Tmavém Lese - Černá věž" + +#: data/levels/world2/worldmap.stwm:4 +msgid "Forest World" +msgstr "Lesní země" + +#: data/levels/world2/castle.stl:5 +msgid "Iceberg Fortress" +msgstr "Ledovcová pevnost" + +#: data/levels/world2/level1.stl:4 +msgid "Roots, Woody Roots" +msgstr "Kořeny, dřevité kořeny" + +#: data/levels/world2/level1.stl:396 +msgid "" +"-Hint:\n" +"#If there seems to be\n" +"#no way to reach a door,\n" +"#remember that you might\n" +"#be supposed to come out\n" +"#of that door..." +msgstr "" +"-Tip:\n" +"#Pokud nemůžeš najít\n" +"#cestu k některým\n" +"#dveřím, možná tudy\n" +"#někdy vyjdeš..." + +#: data/levels/world2/level1.stl:429 +msgid "fireflower" +msgstr "ohnivá květina" + +#: data/levels/world2/level2.stl:4 +msgid "Down The Rabbit Hole" +msgstr "Dolů králičí norou" + +#: data/levels/world2/level2.stl:199 +msgid "eat-me" +msgstr "sněz mě" + +#: data/levels/world2/level2.stl:222 +msgid "" +"-Oh no!\n" +"#The path is blocked! It\n" +"#seems that the only way\n" +"#leads through that dark\n" +"#hole in the ground..." +msgstr "" +"-A jéje!\n" +"#Cesta je zatarasená!\n" +"#Vypadá to, že jediná\n" +"#cesta, která vede dál,\n" +"#je touto dírou dolů..." + +#: data/levels/world2/level2.stl:248 +msgid "-Are you lost?" +msgstr "-Ztratil ses?" + +#: data/levels/world2/level4.stl:4 +msgid "Going Underground" +msgstr "Do podzemí!" + +#: data/levels/world2/level5.stl:4 +msgid "Green Hills" +msgstr "Zelené pláně" + +#: data/levels/world2/level5.stl:194 +msgid "silver-key" +msgstr "stříbrný klíč" + +#: data/levels/world2/level6.stl:4 +msgid "No Name" +msgstr "Beze jména" + +#: data/levels/world2/forest1-grumbel.stl:4 +msgid "Forest Level 1" +msgstr "Lesní úroveň 1" + diff --git a/data/locale/cs.po b/data/locale/cs.po index a0d5d1428..bb312a7d3 100644 --- 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-05-12 20:08+0100\n" +"PO-Revision-Date: 2005-10-10 18:15+0100\n" "Last-Translator: Ondřej Hošek \n" "Language-Team: Czech\n" "MIME-Version: 1.0\n" @@ -16,54 +16,57 @@ msgstr "" "X-Poedit-Language: Czech\n" "X-Poedit-Country: CZECH REPUBLIC\n" -#: src/worldmap.cpp:813 +#: src/worldmap.cpp:814 msgid "GAMEOVER" msgstr "KONEC HRY" -#: src/worldmap.cpp:816 src/game_session.cpp:748 +#: src/worldmap.cpp:817 +#: src/game_session.cpp:748 #, c-format msgid "COINS: %d" msgstr "MINCE: %d" -#: src/worldmap.cpp:821 +#: src/worldmap.cpp:822 msgid "Total Statistics" msgstr "Celková statistika" -#: src/player_status.cpp:132 +#: src/player_status.cpp:201 msgid "COINS" msgstr "MINCE" -#: src/player_status.cpp:155 +#: src/player_status.cpp:225 msgid "LIVES" msgstr "ŽIVOTY" -#: src/title.cpp:122 src/misc.cpp:80 +#: src/title.cpp:128 +#: src/misc.cpp:81 msgid "Contrib Levels" msgstr "Přispěné úrovně" -#: src/title.cpp:141 src/title.cpp:212 src/misc.cpp:96 src/misc.cpp:106 +#: src/title.cpp:151 +#: src/title.cpp:219 +#: src/misc.cpp:97 +#: src/misc.cpp:107 #: src/control/joystickkeyboardcontroller.cpp:554 #: src/control/joystickkeyboardcontroller.cpp:638 msgid "Back" msgstr "Zpět" -#: src/title.cpp:339 +#: src/title.cpp:345 msgid "" "Copyright (c) 2005 SuperTux Devel Team\n" -"This game comes with ABSOLUTELY NO WARRANTY. This is free software, and you " -"are welcome to\n" +"This game comes with ABSOLUTELY NO WARRANTY. This is free software, and you are welcome to\n" "redistribute it under certain conditions; see the file COPYING for details.\n" msgstr "" "Copyright (c) 2005 Tým vývojářů SuperTuxu\n" -"Tato hra přichází BEZ JAKÉKOLIV ZÁRUKY. Tento program je volný software, " -"smíš jej\n" +"Tato hra přichází BEZ JAKÉKOLIV ZÁRUKY. Tento program je volný software, smíš jej\n" "distribuovat dle pokynů v souboru COPYING.\n" -#: src/title.cpp:400 +#: src/title.cpp:406 msgid "Are you sure you want to delete slot" msgstr "Opravdu chcete smazat uloženou hru" -#: src/main.cpp:141 +#: src/main.cpp:183 #, c-format msgid "" "Usage: %s [OPTIONS] LEVELFILE\n" @@ -72,15 +75,18 @@ msgstr "" "Použití: %s [NASTAVENÍ] SOUBOR_ÚROVNĚ\n" "\n" -#: src/main.cpp:143 +#: src/main.cpp:185 #, c-format msgid "" "Options:\n" -" -f, --fullscreen Run in fullscreen mode.\n" -" -w, --window Run in window mode.\n" -" -g, --geometry WIDTHxHEIGHT Run SuperTux in give resolution\n" +" -f, --fullscreen Run in fullscreen mode\n" +" -w, --window Run in window mode\n" +" -g, --geometry WIDTHxHEIGHT Run SuperTux in given resolution\n" " --help Show this help message\n" " --version Display SuperTux version and quit\n" +" --show-fps Display framerate in levels\n" +" --record-demo FILE LEVEL Record a demo to FILE\n" +" --play-demo FILE LEVEL Play a recorded demo\n" "\n" msgstr "" "Nastavení:\n" @@ -89,6 +95,9 @@ msgstr "" " -g, --geometry ŠÍŘKAxVÝŠKA Spustit SuperTux v zadaném rozlišení\n" " --help Zobrazit tento text\n" " --version Zobrazit verzi a ukončit program\n" +" --show-fps Zobrazovat rychlost vykreslování\n" +" --record-demo SOUBOR ÚROVEŇ Nahrát demo úrovně ÚROVEŇ do SOUBORu\n" +" --play-demo SOUBOR ÚROVEŇ Přehrát demo úrovně ÚROVEŇ ze SOBORu\n" "\n" #: src/statistics.cpp:111 @@ -135,75 +144,77 @@ msgstr "Nejvíce zneškod. protivníků: %d / %d" msgid "Min time needed: %d / %d" msgstr "Nejméně upotřebeného času: %d / %d" -#: src/misc.cpp:79 src/misc.cpp:98 +#: src/misc.cpp:80 +#: src/misc.cpp:99 msgid "Start Game" msgstr "Spustit hru" -#: src/misc.cpp:81 src/misc.cpp:86 src/misc.cpp:111 src/misc.cpp:118 +#: src/misc.cpp:82 +#: src/misc.cpp:87 +#: src/misc.cpp:112 +#: src/misc.cpp:119 msgid "Options" msgstr "Nastavení" -#: src/misc.cpp:82 -msgid "Level Editor" -msgstr "Editor úrovní" - -#: src/misc.cpp:83 +#: src/misc.cpp:84 msgid "Credits" msgstr "Autoři" -#: src/misc.cpp:84 +#: src/misc.cpp:85 msgid "Quit" msgstr "Ukončit" -#: src/misc.cpp:88 +#: src/misc.cpp:89 msgid "Fullscreen" msgstr "Plná obrazovka" -#: src/misc.cpp:89 +#: src/misc.cpp:90 msgid "Sound" msgstr "Zvuk" -#: src/misc.cpp:90 +#: src/misc.cpp:91 msgid "Music" msgstr "Hudba" -#: src/misc.cpp:91 +#: src/misc.cpp:92 msgid "Setup Keys" msgstr "Nastavit ovládání" -#: src/misc.cpp:93 +#: src/misc.cpp:94 msgid "Setup Joystick" msgstr "Nastavit joystick" -#: src/misc.cpp:108 src/misc.cpp:115 +#: src/misc.cpp:109 +#: src/misc.cpp:116 msgid "Pause" msgstr "Pauza" -#: src/misc.cpp:110 src/misc.cpp:117 +#: src/misc.cpp:111 +#: src/misc.cpp:118 msgid "Continue" msgstr "Pokračovat" -#: src/misc.cpp:113 +#: src/misc.cpp:114 msgid "Abort Level" msgstr "Přerušit úroveň" -#: src/misc.cpp:120 +#: src/misc.cpp:121 msgid "Quit Game" msgstr "Ukončit hru" -#: src/game_session.cpp:210 +#: src/game_session.cpp:212 msgid "contributed by " msgstr "Autor: " -#: src/game_session.cpp:215 +#: src/game_session.cpp:217 msgid "Best Level Statistics" msgstr "Statistika nejlepších v úrovni" -#: src/game_session.cpp:462 +#: src/game_session.cpp:458 msgid "PAUSE - Press 'P' To Play" msgstr "PAUZA - Stiskněte 'P' k pokračování" -#: src/game_session.cpp:465 +#: src/game_session.cpp:461 msgid "Playing: " msgstr "Úroveň: " @@ -224,22 +235,6 @@ msgstr "Hra" msgid "Free" msgstr "Volná" -#: src/gui/menu.cpp:68 -msgid "Yes" -msgstr "Ano" - -#: src/gui/menu.cpp:69 -msgid "No" -msgstr "Ne" - -#: src/object/level_time.cpp:56 -msgid "TIME's UP" -msgstr "ČAS VYPRŠEL" - -#: src/object/level_time.cpp:61 -msgid "TIME" -msgstr "ČAS" - #: src/control/joystickkeyboardcontroller.cpp:545 msgid "Keyboard Setup" msgstr "Nastavení ovládání" @@ -342,3 +337,20 @@ msgstr "Nenalezen žádný joystick" #: src/control/joystickkeyboardcontroller.cpp:660 msgid "Press Button" msgstr "Stiskněte tlačítko" + +#: src/gui/menu.cpp:68 +msgid "Yes" +msgstr "Ano" + +#: src/gui/menu.cpp:69 +msgid "No" +msgstr "Ne" + +#: src/object/level_time.cpp:57 +msgid "TIME's UP" +msgstr "ČAS VYPRŠEL" + +#: src/object/level_time.cpp:62 +msgid "TIME" +msgstr "ČAS" + diff --git a/src/badguy/badguy.cpp b/src/badguy/badguy.cpp index 700904e4e..b1e27903e 100644 --- a/src/badguy/badguy.cpp +++ b/src/badguy/badguy.cpp @@ -100,6 +100,12 @@ BadGuy::deactivate() } void +BadGuy::save(lisp::Writer& ) +{ + std::cout << "Warning: tried to write out a generic badguy." << std::endl; +} + +void BadGuy::active_update(float elapsed_time) { movement = physic.get_movement(elapsed_time); diff --git a/src/badguy/badguy.hpp b/src/badguy/badguy.hpp index 8b759df37..93731772c 100644 --- a/src/badguy/badguy.hpp +++ b/src/badguy/badguy.hpp @@ -66,6 +66,11 @@ public: */ virtual void kill_fall(); + /** Writes out the badguy into the included lisp::Writer. Useful e.g. when + * converting an old-format level to the new format. + */ + virtual void save(lisp::Writer& ); + Vector get_start_position() const { return start_position; diff --git a/src/badguy/kugelblitz.cpp b/src/badguy/kugelblitz.cpp index 66354c891..4c7f5eb32 100644 --- a/src/badguy/kugelblitz.cpp +++ b/src/badguy/kugelblitz.cpp @@ -49,7 +49,6 @@ Kugelblitz::write(lisp::Writer& writer) writer.start_list("kugelblitz"); writer.write_float("x", start_position.x); - writer.write_float("y", start_position.y); writer.end_list("kugelblitz"); } diff --git a/src/badguy/rocketexplosion.cpp b/src/badguy/rocketexplosion.cpp index e79e847d8..e7f594b8c 100644 --- a/src/badguy/rocketexplosion.cpp +++ b/src/badguy/rocketexplosion.cpp @@ -38,7 +38,7 @@ RocketExplosion::RocketExplosion(const Vector& pos, Direction dir) void RocketExplosion::write(lisp::Writer& ) { - // bombs are only temporarily so don't write them out... + // rocket explosions are only temporarily so don't write them out... } HitResponse diff --git a/src/badguy/snowball.cpp b/src/badguy/snowball.cpp index e7f049dc6..847008c0c 100644 --- a/src/badguy/snowball.cpp +++ b/src/badguy/snowball.cpp @@ -55,6 +55,10 @@ SnowBall::write(lisp::Writer& writer) writer.write_float("x", start_position.x); writer.write_float("y", start_position.y); + if (fluffy) { // don't give us away at every snowball + writer.write_bool("fluffy", true) + } + writer.end_list("snowball"); } diff --git a/src/badguy/yeti.cpp b/src/badguy/yeti.cpp index 8fb1a9578..e5a9b5ca6 100644 --- a/src/badguy/yeti.cpp +++ b/src/badguy/yeti.cpp @@ -168,6 +168,16 @@ Yeti::kill_fall() void Yeti::write(lisp::Writer& ) { + writer.start_list("yeti"); + + writer.write_float("x", start_position.x); + writer.write_float("y", start_position.y); + + if(dead_script != "") { + writer.write_string("dead-script", dead_script); + } + + writer.end_list("yeti"); } void diff --git a/src/badguy/yeti_stalactite.cpp b/src/badguy/yeti_stalactite.cpp index 52ef203bb..c35af3873 100644 --- a/src/badguy/yeti_stalactite.cpp +++ b/src/badguy/yeti_stalactite.cpp @@ -32,6 +32,15 @@ YetiStalactite::~YetiStalactite() } void +YetiStalactite::write(lisp::Writer& writer) +{ + writer.start_list("yeti_stalactite"); + writer.write_float("x", start_position.x); + writer.write_float("y", start_position.y); + writer.end_list("yeti_stalactite"); +} + +void YetiStalactite::start_shaking() { timer.start(SHAKE_TIME); diff --git a/src/badguy/yeti_stalactite.hpp b/src/badguy/yeti_stalactite.hpp index 1a9faa114..9030d773e 100644 --- a/src/badguy/yeti_stalactite.hpp +++ b/src/badguy/yeti_stalactite.hpp @@ -29,6 +29,7 @@ public: YetiStalactite(const lisp::Lisp& lisp); virtual ~YetiStalactite(); + void write(lisp::Writer& ); void active_update(float elapsed_time); void start_shaking(); bool is_hanging(); -- 2.11.0