Fix crash on ESC press when no music is playing

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

diff --git a/src/object/cloud_particle_system.cpp b/src/object/cloud_particle_system.cpp
index 0e2659e..396d295 100644 (file)
--- a/src/object/cloud_particle_system.cpp
+++ b/src/object/cloud_particle_system.cpp
@@ -19,24 +19,22 @@
 #include <math.h>
 
 #include "math/random_generator.hpp"
-#include "supertux/main.hpp"
+#include "supertux/globals.hpp"
 #include "video/drawing_context.hpp"
 
 CloudParticleSystem::CloudParticleSystem() :
   ParticleSystem(128),
-  cloudimage()
+  cloudimage(Surface::create("images/objects/particles/cloud.png"))
 {
-  cloudimage = new Surface("images/objects/particles/cloud.png");
-
   virtual_width = 2000.0;
 
   // create some random clouds
   for(size_t i=0; i<15; ++i) {
     CloudParticle* particle = new CloudParticle;
-    particle->pos.x = systemRandom.rand(static_cast<int>(virtual_width));
-    particle->pos.y = systemRandom.rand(static_cast<int>(virtual_height));
+    particle->pos.x = graphicsRandom.rand(static_cast<int>(virtual_width));
+    particle->pos.y = graphicsRandom.rand(static_cast<int>(virtual_height));
     particle->texture = cloudimage;
-    particle->speed = -systemRandom.randf(25.0, 54.0);
+    particle->speed = -graphicsRandom.randf(25.0, 54.0);
 
     particles.push_back(particle);
   }
@@ -45,12 +43,11 @@ CloudParticleSystem::CloudParticleSystem() :
 void
 CloudParticleSystem::parse(const Reader& reader)
 {
-  reader.get("z-pos", z_pos);
+  z_pos = reader_get_layer (reader, /* default = */ LAYER_BACKGROUND1);
 }
 
 CloudParticleSystem::~CloudParticleSystem()
 {
-  delete cloudimage;
 }
 
 void CloudParticleSystem::update(float elapsed_time)