added rain ambient sound

added a flexlay icon for the ambient sound object (borrowed from KDE)

SVN-Revision: 2438

diff --git a/basest/images/engine/editor/ambientsound.png b/basest/images/engine/editor/ambientsound.png
new file mode 100644 (file)
index 0000000..386db13
Binary files /dev/null and b/basest/images/engine/editor/ambientsound.png differ

diff --git a/basest/levels/test/ambient_sound.stl b/basest/levels/test/ambient_sound.stl
index 63ab676..3356744 100644 (file)
--- a/basest/levels/test/ambient_sound.stl
+++ b/basest/levels/test/ambient_sound.stl
@@ -6,8 +6,6 @@
   (sector
     (name  "main")
     (gravity 10.000000)
-    (background (image "arctis.jpg")
-                (speed 0.5))
     (tilemap
       (layer  "background")
       (solid #f)
@@ -59,27 +57,22 @@
         61 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 
         61 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 
         61 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 
-        61 0 0 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 
-61 0 0 0 0 0 0 61 
+        61 0 0 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 0 0 0 0 0 0 61 
         61 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 
         61 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 0 0 0 61 61 
         61 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 61 0 0 0 61 
         61 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 
         61 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 61 
-        61 0 0 0 0 61 61 61 61 61 61 61 61 0 0 0 0 0 0 0 0 0 0 0 0 61 0 
-0 0 61 
+        61 0 0 0 0 61 61 61 61 61 61 61 61 0 0 0 0 0 0 0 0 0 0 0 0 61 0 0 0 61 
         61 0 0 0 0 0 0 0 0 0 0 0 61 0 0 0 0 0 0 0 0 0 0 0 0 61 61 0 0 61 
-        61 0 0 0 0 0 0 0 0 0 0 0 61 61 61 61 0 0 0 0 0 0 0 0 0 0 0 0 0 
-61 
+        61 0 0 0 0 0 0 0 0 0 0 0 61 61 61 61 0 0 0 0 0 0 0 0 0 0 0 0 0 61 
         61 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 61 61 0 0 0 0 0 0 0 0 0 0 0 61 
         61 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 0 0 0 0 0 0 0 0 0 0 61 61 
-        61 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 61 61 0 0 0 0 61 0 0 0 0 
-61 
+        61 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 61 61 0 0 0 0 61 0 0 0 0 61 
         61 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 0 0 0 0 61 61 0 0 0 61 
         61 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 61 61 0 0 0 0 0 0 0 61 
         61 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 0 0 0 0 0 0 0 61 
-        61 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 61 61 0 0 0 0 61 
-61 
+        61 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 61 61 0 0 0 0 61 61 
         61 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 0 0 0 0 0 61 
         61 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 61 61 0 0 0 61 
         61 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 0 0 0 61 
@@ -135,9 +128,12 @@
          (image "arctis.jpg")
          (speed 0.500000)
        )
+       (background
+         (image "arctis.jpg")
+         (speed 0.500000)
+       )
        (spawnpoint (name "main") (x 96) (y 160))
-      (ambient_sound (x 128) (y 800) (distance_factor 0.1) 
-        (distance_bias 200) (sample "waterfall"))
+       (ambient_sound (x 128) (y 800) (distance_factor "0.1") (distance_bias "200.0") (sample "rain"))
       (infoblock (x 128) (y 800)
         (message (_ "-Info
 #An ambient sound source

diff --git a/basest/locale/messages.pot b/basest/locale/messages.pot
index e3b1b63..45ab246 100644 (file)
--- a/basest/locale/messages.pot
+++ b/basest/locale/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-07 15:47+0200\n"
+"POT-Creation-Date: 2005-05-07 16:56+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"
@@ -424,14 +424,14 @@ msgstr ""
 msgid "Free"
 msgstr ""
 
-#: src/main.cpp:141
+#: src/main.cpp:142
 #, c-format
 msgid ""
 "Usage: %s [OPTIONS] LEVELFILE\n"
 "\n"
 msgstr ""
 
-#: src/main.cpp:143
+#: src/main.cpp:144
 #, c-format
 msgid ""
 "Options:\n"

diff --git a/basest/sounds/rain.wav b/basest/sounds/rain.wav
new file mode 100644 (file)
index 0000000..7509a53
Binary files /dev/null and b/basest/sounds/rain.wav differ