Fix crash on ESC press when no music is playing

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

diff --git a/src/object/ghost_particle_system.cpp b/src/object/ghost_particle_system.cpp
index aca6ccd..dd2e047 100644 (file)
--- a/src/object/ghost_particle_system.cpp
+++ b/src/object/ghost_particle_system.cpp
@@ -1,5 +1,5 @@
 //  SuperTux
-//  Copyright (C) 2009 Ingo Ruhnke <grumbel@gmx.de>
+//  Copyright (C) 2009 Ingo Ruhnke <grumbel@gmail.com>
 //
 //  This program is free software: you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
@@ -26,8 +26,8 @@
 //       Ghosts don't change their movement pattern - not random
 GhostParticleSystem::GhostParticleSystem()
 {
-  ghosts[0] = new Surface("images/objects/particles/ghost0.png");
-  ghosts[1] = new Surface("images/objects/particles/ghost1.png");
+  ghosts[0] = Surface::create("images/objects/particles/ghost0.png");
+  ghosts[1] = Surface::create("images/objects/particles/ghost1.png");
 
   virtual_width = SCREEN_WIDTH * 2;
 
@@ -35,11 +35,11 @@ GhostParticleSystem::GhostParticleSystem()
   size_t ghostcount = 2;
   for(size_t i=0; i<ghostcount; ++i) {
     GhostParticle* particle = new GhostParticle;
-    particle->pos.x = systemRandom.randf(virtual_width);
-    particle->pos.y = systemRandom.randf(SCREEN_HEIGHT);
-    int size = systemRandom.rand(2);
+    particle->pos.x = graphicsRandom.randf(virtual_width);
+    particle->pos.y = graphicsRandom.randf(SCREEN_HEIGHT);
+    int size = graphicsRandom.rand(2);
     particle->texture = ghosts[size];
-    particle->speed = systemRandom.randf(std::max(50, (size * 10)), 180 + (size * 10));
+    particle->speed = graphicsRandom.randf(std::max(50, (size * 10)), 180 + (size * 10));
     particles.push_back(particle);
   }
 }
@@ -47,13 +47,11 @@ GhostParticleSystem::GhostParticleSystem()
 void
 GhostParticleSystem::parse(const Reader& reader)
 {
-  reader.get("z-pos", z_pos);
+  z_pos = reader_get_layer (reader, /* default = */ LAYER_BACKGROUND1);
 }
 
 GhostParticleSystem::~GhostParticleSystem()
 {
-  for(int i=0;i<2;++i)
-    delete ghosts[i];
 }
 
 void GhostParticleSystem::update(float elapsed_time)
@@ -65,7 +63,7 @@ void GhostParticleSystem::update(float elapsed_time)
     particle->pos.x -= particle->speed * elapsed_time;
     if(particle->pos.y > SCREEN_HEIGHT) {
       particle->pos.y = fmodf(particle->pos.y , virtual_height);
-      particle->pos.x = systemRandom.rand(static_cast<int>(virtual_width));
+      particle->pos.x = graphicsRandom.rand(static_cast<int>(virtual_width));
     }
   }
 }