converted ghost forest music to .ogg because of problems playing the mod file

added vorbis tags to .ogg files
added a FIXME to the ghost particle system

SVN-Revision: 2525

diff --git a/data/levels/test/raintest.stl b/data/levels/test/raintest.stl
index 1886827..2d6b46c 100644 (file)
--- a/data/levels/test/raintest.stl
+++ b/data/levels/test/raintest.stl
@@ -6,7 +6,7 @@
   (sector
     (name  "main")
     (gravity 10.000000)
-    (music "ghostforest2.mod")
+    (music "ghostforest2.ogg")
     (tilemap
       (layer  "background")
       (solid #f)

diff --git a/data/music/credits.ogg b/data/music/credits.ogg
index b1642a9..278fac0 100644 (file)
Binary files a/data/music/credits.ogg and b/data/music/credits.ogg differ

diff --git a/data/music/ghostforest2.mod b/data/music/ghostforest2.mod
deleted file mode 100644 (file)
index 0f509d2..0000000
Binary files a/data/music/ghostforest2.mod and /dev/null differ

diff --git a/data/music/ghostforest2.ogg b/data/music/ghostforest2.ogg
new file mode 100644 (file)
index 0000000..6e6fbfe
Binary files /dev/null and b/data/music/ghostforest2.ogg differ

diff --git a/data/music/theme.ogg b/data/music/theme.ogg
index b16753c..7386856 100644 (file)
Binary files a/data/music/theme.ogg and b/data/music/theme.ogg differ

diff --git a/src/object/particlesystem.cpp b/src/object/particlesystem.cpp
index 3dc2bf6..4a78b96 100644 (file)
--- a/src/object/particlesystem.cpp
+++ b/src/object/particlesystem.cpp
@@ -129,6 +129,8 @@ void SnowParticleSystem::update(float elapsed_time)
     }
 }
 
+//FIXME: Sometimes both ghosts have the same image
+//       Ghosts don't change their movement pattern - not random
 GhostParticleSystem::GhostParticleSystem()
 {
     ghosts[0] = new Surface(datadir+"/images/objects/particles/ghost0.png", true);
@@ -136,7 +138,7 @@ GhostParticleSystem::GhostParticleSystem()
 
     virtual_width = SCREEN_WIDTH * 2;
 
-    // create some random snowflakes
+    // create two ghosts
     size_t ghostcount = 2;
     for(size_t i=0; i<ghostcount; ++i) {
         GhostParticle* particle = new GhostParticle;