Background can now render three images: Top, Center and Bottom

[supertux.git] / src / object / particlesystem.cpp

diff --git a/src/object/particlesystem.cpp b/src/object/particlesystem.cpp
index c9b484b..3f505e6 100644 (file)
--- a/src/object/particlesystem.cpp
+++ b/src/object/particlesystem.cpp
@@ -28,6 +28,7 @@
 #include "lisp/writer.hpp"
 #include "resources.hpp"
 #include "main.hpp"
+#include "object/camera.hpp"
 
 ParticleSystem::ParticleSystem()
 {
@@ -83,8 +84,8 @@ SnowParticleSystem::SnowParticleSystem()
     size_t snowflakecount = size_t(virtual_width/10.0);
     for(size_t i=0; i<snowflakecount; ++i) {
         SnowParticle* particle = new SnowParticle;
-        particle->pos.x = rand() % int(virtual_width);
-        particle->pos.y = rand() % SCREEN_HEIGHT;
+        particle->pos.x = fmodf(rand(), virtual_width);
+        particle->pos.y = fmodf(rand(), SCREEN_HEIGHT);
         int snowsize = rand() % 3;
         particle->texture = snowimages[snowsize];
         do {
@@ -122,7 +123,7 @@ void SnowParticleSystem::update(float elapsed_time)
     for(i = particles.begin(); i != particles.end(); ++i) {
         SnowParticle* particle = (SnowParticle*) *i;
         particle->pos.y += particle->speed * elapsed_time;
-        if(particle->pos.y > SCREEN_HEIGHT) {
+        if(particle->pos.y > SCREEN_HEIGHT + Sector::current()->camera->get_translation().y) {
             particle->pos.y = fmodf(particle->pos.y , virtual_height);
             particle->pos.x = rand() % int(virtual_width);
         }
@@ -142,8 +143,8 @@ GhostParticleSystem::GhostParticleSystem()
     size_t ghostcount = 2;
     for(size_t i=0; i<ghostcount; ++i) {
         GhostParticle* particle = new GhostParticle;
-        particle->pos.x = rand() % int(virtual_width);
-        particle->pos.y = rand() % SCREEN_HEIGHT;
+        particle->pos.x = fmodf(rand(), virtual_width);
+        particle->pos.y = fmodf(rand(), SCREEN_HEIGHT);
         int size = rand() % 2;
         particle->texture = ghosts[size];
         do {