- Removed messaged.pot from version control (which probably happened

  accidentaly during wansti's flag day)
- added a wind effect source

SVN-Revision: 2442

diff --git a/basest/levels/world2/messages.pot b/basest/levels/world2/messages.pot
index d3c78cc..b7d8c79 100644 (file)
--- a/basest/levels/world2/messages.pot
+++ b/basest/levels/world2/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-05 10:42+0200\n"
+"POT-Creation-Date: 2005-05-08 19:37+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,10 +16,6 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: basest/levels/world2/forest1-grumbel.stl:4
-msgid "Forest Level 1"
-msgstr ""
-
 #: basest/levels/world2/castle.stl:5
 msgid "Iceberg Fortress"
 msgstr ""
@@ -30,6 +26,14 @@ msgstr ""
 
 #: basest/levels/world2/level1.stl:396
 msgid ""
-" Hint: If there seems to be no way to reach a door, remember that maybe you "
-"are supposed to reach it from the other side..."
+"-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 ""
+
+#: basest/levels/world2/forest1-grumbel.stl:4
+msgid "Forest Level 1"
 msgstr ""

diff --git a/basest/locale/messages.pot b/basest/locale/messages.pot
deleted file mode 100644 (file)
index deeab35..0000000
--- a/basest/locale/messages.pot
+++ /dev/null
@@ -1,555 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-07 18:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: src/worldmap.cpp:760
-msgid "GAMEOVER"
-msgstr ""
-
-#: src/worldmap.cpp:763 src/game_session.cpp:799
-#, c-format
-msgid "COINS: %d"
-msgstr ""
-
-#: src/worldmap.cpp:768
-msgid "Total Statistics"
-msgstr ""
-
-#: src/worldmap.cpp:898 src/game_session.cpp:720
-msgid "SCORE"
-msgstr ""
-
-#: src/worldmap.cpp:902 src/game_session.cpp:741 src/game_session.cpp:742
-msgid "COINS"
-msgstr ""
-
-#: src/worldmap.cpp:923 src/worldmap.cpp:924 src/game_session.cpp:763
-#: src/game_session.cpp:764
-msgid "LIVES"
-msgstr ""
-
-#: src/misc.cpp:79 src/misc.cpp:98
-msgid "Start Game"
-msgstr ""
-
-#: src/misc.cpp:80 src/title.cpp:122
-msgid "Contrib Levels"
-msgstr ""
-
-#: src/misc.cpp:81 src/misc.cpp:86 src/misc.cpp:111 src/misc.cpp:118
-msgid "Options"
-msgstr ""
-
-#: src/misc.cpp:82 src/leveleditor.cpp:578
-msgid "Level Editor"
-msgstr ""
-
-#: src/misc.cpp:83
-msgid "Credits"
-msgstr ""
-
-#: src/misc.cpp:84
-msgid "Quit"
-msgstr ""
-
-#: src/misc.cpp:88
-msgid "Fullscreen"
-msgstr ""
-
-#: src/misc.cpp:89
-msgid "Sound"
-msgstr ""
-
-#: src/misc.cpp:90
-msgid "Music"
-msgstr ""
-
-#: src/misc.cpp:91
-msgid "Setup Keys"
-msgstr ""
-
-#: src/misc.cpp:93
-msgid "Setup Joystick"
-msgstr ""
-
-#: src/misc.cpp:96 src/misc.cpp:106 src/leveleditor.cpp:86
-#: src/leveleditor.cpp:96 src/title.cpp:141 src/title.cpp:214
-#: src/control/joystickkeyboardcontroller.cpp:539
-#: src/control/joystickkeyboardcontroller.cpp:623
-msgid "Back"
-msgstr ""
-
-#: src/misc.cpp:108 src/misc.cpp:115
-msgid "Pause"
-msgstr ""
-
-#: src/misc.cpp:110 src/misc.cpp:117
-msgid "Continue"
-msgstr ""
-
-#: src/misc.cpp:113
-msgid "Abort Level"
-msgstr ""
-
-#: src/misc.cpp:120
-msgid "Quit Game"
-msgstr ""
-
-#: src/main.cpp:141
-#, c-format
-msgid ""
-"Usage: %s [OPTIONS] LEVELFILE\n"
-"\n"
-msgstr ""
-
-#: src/main.cpp:143
-#, 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"
-"  --help                       Show this help message\n"
-"  --version                    Display SuperTux version and quit\n"
-"\n"
-msgstr ""
-
-#: src/leveleditor.cpp:80
-msgid "Load Subset"
-msgstr ""
-
-#: src/leveleditor.cpp:89
-msgid "New Level Subset"
-msgstr ""
-
-#: src/leveleditor.cpp:91
-msgid "Filename   "
-msgstr ""
-
-#: src/leveleditor.cpp:92
-msgid "Title      "
-msgstr ""
-
-#: src/leveleditor.cpp:93
-msgid "Description"
-msgstr ""
-
-#: src/leveleditor.cpp:94
-msgid "Create"
-msgstr ""
-
-#: src/leveleditor.cpp:99
-msgid "Level Editor Menu"
-msgstr ""
-
-#: src/leveleditor.cpp:101
-msgid "Return to Level Editor"
-msgstr ""
-
-#: src/leveleditor.cpp:102
-msgid "Create Level Subset"
-msgstr ""
-
-#: src/leveleditor.cpp:103
-msgid "Load Level Subset"
-msgstr ""
-
-#: src/leveleditor.cpp:105
-msgid "Quit Level Editor"
-msgstr ""
-
-#: src/leveleditor.cpp:108
-msgid "Level Settings"
-msgstr ""
-
-#: src/leveleditor.cpp:110
-msgid "Name    "
-msgstr ""
-
-#: src/leveleditor.cpp:111
-msgid "Author  "
-msgstr ""
-
-#: src/leveleditor.cpp:112
-msgid "Width   "
-msgstr ""
-
-#: src/leveleditor.cpp:113
-msgid "Height  "
-msgstr ""
-
-#: src/leveleditor.cpp:115
-msgid "Apply"
-msgstr ""
-
-#: src/leveleditor.cpp:123
-msgid "Eraser"
-msgstr ""
-
-#: src/leveleditor.cpp:150
-msgid "Edtit foreground tiles"
-msgstr ""
-
-#: src/leveleditor.cpp:152
-msgid "Edit interactive tiles"
-msgstr ""
-
-#: src/leveleditor.cpp:154
-msgid "Edit background tiles"
-msgstr ""
-
-#: src/leveleditor.cpp:158
-msgid "Next sector"
-msgstr ""
-
-#: src/leveleditor.cpp:159
-msgid "Prevous sector"
-msgstr ""
-
-#: src/leveleditor.cpp:160
-msgid "Next level"
-msgstr ""
-
-#: src/leveleditor.cpp:161
-msgid "Prevous level"
-msgstr ""
-
-#: src/leveleditor.cpp:162
-msgid "Save level"
-msgstr ""
-
-#: src/leveleditor.cpp:163
-msgid "Test level"
-msgstr ""
-
-#: src/leveleditor.cpp:164
-msgid "Setup level"
-msgstr ""
-
-#: src/leveleditor.cpp:246 src/leveleditor.cpp:742 src/leveleditor.cpp:768
-#: src/leveleditor.cpp:846
-msgid "Level not saved. Wanna to?"
-msgstr ""
-
-#: src/leveleditor.cpp:373
-#, c-format
-msgid "Level %d doesn't exist. Create it?"
-msgstr ""
-
-#: src/leveleditor.cpp:601
-msgid "F1 for help"
-msgstr ""
-
-#: src/leveleditor.cpp:603
-msgid "Choose a level subset"
-msgstr ""
-
-#: src/leveleditor.cpp:786
-msgid "No more sectors exist. Create another?"
-msgstr ""
-
-#: src/leveleditor.cpp:940
-msgid ""
-"This is the built-in level editor. Its aim is to be intuitive\n"
-"and simple to use, so it should be pretty straightforward.\n"
-"\n"
-"To open a level, first you'll have to select a level subset from\n"
-"the menu (or create your own).\n"
-"A level subset is basically a collection of levels.\n"
-"They can then be played from the Contrib menu.\n"
-"\n"
-"To access the menu from the level editor, just press Esc.\n"
-"\n"
-"You are currently looking at the level. To scroll it, just\n"
-"press the right mouse button and drag the mouse. It will move like\n"
-"a strategy game.\n"
-"You can also use the arrow keys and Page Up/Down.\n"
-"\n"
-"'+' and '-' keys can be used to zoom the level in/out.\n"
-"\n"
-"You probably already noticed those floating groups of buttons.\n"
-"Each one serves a different purpose. To select a certain button\n"
-"just press the Left mouse button on it. A few buttons have key\n"
-"shortcuts. You can find them by pressing the Right mouse button on\n"
-"a button. That will also show what that button does.\n"
-"Groups of buttons can also be moved around by just dragging them,\n"
-"while pressing the Left mouse button.\n"
-"\n"
-"Let's learn a bit of what each group of buttons does, shall we?\n"
-"\n"
-"To starting putting tiles and objects around use the bigger group\n"
-"of buttons. Each button is a different tile. To put it on the level,\n"
-"just press it and then left click in the level.\n"
-"You can also copy tiles from the level by using the middle mouse button.\n"
-"Use the mouse wheel to scroll that group of buttons. You will find\n"
-"enemies and game objects in the bottom.\n"
-msgstr ""
-
-#: src/leveleditor.cpp:976
-msgid ""
-"The Foreground/Interactive/Background buttons may be used to\n"
-"see and edit the respective layer. Levels have three tiles layers:\n"
-"Foreground - tiles are drawn on top of everything and have no contact\n"
-"with the player.\n"
-"Interactive - these are the tiles that have contact with the player.\n"
-"Background - tiles are drawn underneath everything and have no contact\n"
-"with the player.\n"
-"The unselected layers will be drawn semi-transparently.\n"
-"\n"
-"Last, but not least, the group of buttons that's left serves\n"
-"to do related actions with the level.\n"
-"From left to right:\n"
-"Mini arrows - can be used to choose other sectors.\n"
-"Sectors are mini-levels, so to speak, that can be accessed using a door.\n"
-"Big arrows - choose other level in the same level subset.\n"
-"Diskette - save the level\n"
-"Tux - test the level\n"
-"Tools - set a few settings for the level, including resizing it.\n"
-"\n"
-"We have reached the end of this Howto.\n"
-"\n"
-"Don't forget to send us a few cool levels. :)\n"
-"\n"
-"Enjoy,\n"
-"  SuperTux development team\n"
-"\n"
-"PS: If you are looking for something more powerful, you might like to\n"
-"try FlexLay. FlexLay is a level editor that supports several games,\n"
-"including SuperTux. It is an independent project.\n"
-"Webpage: http://pingus.seul.org/~grumbel/flexlay/"
-msgstr ""
-
-#: src/leveleditor.cpp:1016
-msgid "- Level Editor's Help -"
-msgstr ""
-
-#: src/leveleditor.cpp:1020
-#, c-format
-msgid "Press any key to continue - Page %d/%d"
-msgstr ""
-
-#: src/title.cpp:341
-msgid ""
-"Copyright (c) 2003 SuperTux Devel Team\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 ""
-
-#: src/title.cpp:402
-msgid "Are you sure you want to delete slot"
-msgstr ""
-
-#: src/statistics.cpp:111
-msgid "- Best Level Statistics -"
-msgstr ""
-
-#: src/statistics.cpp:115
-#, c-format
-msgid "Max score:"
-msgstr ""
-
-#: src/statistics.cpp:135
-#, c-format
-msgid "Max coins collected:"
-msgstr ""
-
-#: src/statistics.cpp:137
-#, c-format
-msgid "Max fragging:"
-msgstr ""
-
-#: src/statistics.cpp:139
-#, c-format
-msgid "Min time needed:"
-msgstr ""
-
-#: src/statistics.cpp:168
-#, c-format
-msgid "Max score:             %d"
-msgstr ""
-
-#: src/statistics.cpp:174
-#, c-format
-msgid "Max coins collected:   %d / %d"
-msgstr ""
-
-#: src/statistics.cpp:178
-#, c-format
-msgid "Max fragging:          %d / %d"
-msgstr ""
-
-#: src/statistics.cpp:182
-#, c-format
-msgid "Min time needed:       %d / %d"
-msgstr ""
-
-#: src/game_session.cpp:210
-msgid "contributed by "
-msgstr ""
-
-#: src/game_session.cpp:215
-msgid "Best Level Statistics"
-msgstr ""
-
-#: src/game_session.cpp:468
-msgid "PAUSE - Press 'P' To Play"
-msgstr ""
-
-#: src/game_session.cpp:471
-msgid "Playing: "
-msgstr ""
-
-#: src/game_session.cpp:724
-msgid "Press ESC To Return"
-msgstr ""
-
-#: src/game_session.cpp:729
-msgid "TIME's UP"
-msgstr ""
-
-#: src/game_session.cpp:734
-msgid "TIME"
-msgstr ""
-
-#: src/game_session.cpp:793
-msgid "Result:"
-msgstr ""
-
-#: src/game_session.cpp:796
-#, c-format
-msgid "SCORE: %d"
-msgstr ""
-
-#: src/game_session.cpp:826
-msgid "Slot"
-msgstr ""
-
-#: src/game_session.cpp:827
-msgid "Free"
-msgstr ""
-
-#: src/gui/menu.cpp:68
-msgid "Yes"
-msgstr ""
-
-#: src/gui/menu.cpp:69
-msgid "No"
-msgstr ""
-
-#: src/control/joystickkeyboardcontroller.cpp:530
-msgid "Keyboard Setup"
-msgstr ""
-
-#: src/control/joystickkeyboardcontroller.cpp:532
-msgid "Up"
-msgstr ""
-
-#: src/control/joystickkeyboardcontroller.cpp:533
-msgid "Down"
-msgstr ""
-
-#: src/control/joystickkeyboardcontroller.cpp:534
-msgid "Left"
-msgstr ""
-
-#: src/control/joystickkeyboardcontroller.cpp:535
-msgid "Right"
-msgstr ""
-
-#: src/control/joystickkeyboardcontroller.cpp:536
-#: src/control/joystickkeyboardcontroller.cpp:616
-msgid "Jump"
-msgstr ""
-
-#: src/control/joystickkeyboardcontroller.cpp:537
-#: src/control/joystickkeyboardcontroller.cpp:617
-msgid "Shoot/Run"
-msgstr ""
-
-#: src/control/joystickkeyboardcontroller.cpp:551
-#: src/control/joystickkeyboardcontroller.cpp:634
-msgid "None"
-msgstr ""
-
-#: src/control/joystickkeyboardcontroller.cpp:553
-msgid "Up cursor"
-msgstr ""
-
-#: src/control/joystickkeyboardcontroller.cpp:555
-msgid "Down cursor"
-msgstr ""
-
-#: src/control/joystickkeyboardcontroller.cpp:557
-msgid "Left cursor"
-msgstr ""
-
-#: src/control/joystickkeyboardcontroller.cpp:559
-msgid "Right cursor"
-msgstr ""
-
-#: src/control/joystickkeyboardcontroller.cpp:561
-msgid "Return"
-msgstr ""
-
-#: src/control/joystickkeyboardcontroller.cpp:563
-msgid "Space"
-msgstr ""
-
-#: src/control/joystickkeyboardcontroller.cpp:565
-msgid "Right Shift"
-msgstr ""
-
-#: src/control/joystickkeyboardcontroller.cpp:567
-msgid "Left Shift"
-msgstr ""
-
-#: src/control/joystickkeyboardcontroller.cpp:569
-msgid "Right Control"
-msgstr ""
-
-#: src/control/joystickkeyboardcontroller.cpp:571
-msgid "Left Control"
-msgstr ""
-
-#: src/control/joystickkeyboardcontroller.cpp:573
-msgid "Right Alt"
-msgstr ""
-
-#: src/control/joystickkeyboardcontroller.cpp:575
-msgid "Left Alt"
-msgstr ""
-
-#: src/control/joystickkeyboardcontroller.cpp:585
-msgid "Press Key"
-msgstr ""
-
-#: src/control/joystickkeyboardcontroller.cpp:613
-msgid "Joystick Setup"
-msgstr ""
-
-#: src/control/joystickkeyboardcontroller.cpp:618
-msgid "Pause/Menu"
-msgstr ""
-
-#: src/control/joystickkeyboardcontroller.cpp:620
-msgid "No Joysticks found"
-msgstr ""
-
-#: src/control/joystickkeyboardcontroller.cpp:645
-msgid "Press Button"
-msgstr ""

diff --git a/contrib/sounds/csound/Makefile b/contrib/sounds/csound/Makefile
index 2222101..021dc55 100644 (file)
--- a/contrib/sounds/csound/Makefile
+++ b/contrib/sounds/csound/Makefile
@@ -2,7 +2,7 @@
 CSOUND = /usr/bin/csound
 SOX = /usr/bin/sox
 
-sounds: bubble.wav rain.wav lava.wav waterfall.wav flower.wav
+sounds: bubble.wav rain.wav lava.wav waterfall.wav flower.wav wind.wav
 
 %.wav: %.sco sfx.orc 
        $(CSOUND) sfx.orc $< -W -o $@.1 -g

diff --git a/contrib/sounds/csound/sfx.orc b/contrib/sounds/csound/sfx.orc
index e06f1d1..08982d2 100644 (file)
--- a/contrib/sounds/csound/sfx.orc
+++ b/contrib/sounds/csound/sfx.orc
@@ -103,4 +103,18 @@ instr 4
 
        out aout*kamp
 
+endin
+
+
+instr 5 ; Wind
+
+       ifqc= cpspch(p4)
+       
+       kfmanip oscil3 1,1/p3,1
+       kvol    linseg 0,0.1*p3,1,0.8*p3,1,0.1*p3,0
+       aout    oscil3 p5,ifqc*kfmanip,2
+       aout    butterhp aout,2000,0.7
+       aout    butterlp aout,10000,0.7
+       aout    phaser2 aout,ifqc*kfmanip,0.7,1,0.2,0.5
+       out aout*kvol*(kfmanip/2.5)
 endin
\ No newline at end of file

diff --git a/contrib/sounds/csound/wind.sco b/contrib/sounds/csound/wind.sco
new file mode 100644 (file)
index 0000000..60aa16b
--- /dev/null
+++ b/contrib/sounds/csound/wind.sco
@@ -0,0 +1,9 @@
+
+f 1 0 16384 8 2 4096 1.5 4096 2.5 4096 1 4096 1
+f 2 0 65536 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0.1 0 1 0 1 0 1 0 0 1
+
+i5 0 10 7 30000
+
+f 1 10 16384 8 1.5 4096 2 4096 0.5 4096 2 4096 1
+
+i5 10 10 8 30000
\ No newline at end of file