Pause music when pressing ESC during a level and resume it when exiting the pause...

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

diff --git a/src/object/pneumatic_platform.cpp b/src/object/pneumatic_platform.cpp
index 99fd2c6..c76f8b1 100644 (file)
--- a/src/object/pneumatic_platform.cpp
+++ b/src/object/pneumatic_platform.cpp
@@ -22,23 +22,23 @@
 #include "supertux/sector.hpp"
 
 PneumaticPlatform::PneumaticPlatform(const Reader& reader) :
-  MovingSprite(reader, LAYER_OBJECTS, COLGROUP_STATIC), 
-  master(0), 
-  slave(0), 
+  MovingSprite(reader, LAYER_OBJECTS, COLGROUP_STATIC),
+  master(0),
+  slave(0),
   start_y(0),
-  offset_y(0), 
+  offset_y(0),
   speed_y(0),
   contacts()
 {
   start_y = get_pos().y;
 }
 
-PneumaticPlatform::PneumaticPlatform(PneumaticPlatform* master) :
-  MovingSprite(*master), 
-  master(master), 
-  slave(this), 
-  start_y(master->start_y),
-  offset_y(-master->offset_y), 
+PneumaticPlatform::PneumaticPlatform(PneumaticPlatform* master_) :
+  MovingSprite(*master_),
+  master(master_),
+  slave(this),
+  start_y(master_->start_y),
+  offset_y(-master_->offset_y),
   speed_y(0),
   contacts()
 {
@@ -47,7 +47,7 @@ PneumaticPlatform::PneumaticPlatform(PneumaticPlatform* master) :
   master->slave = this;
 }
 
-PneumaticPlatform::~PneumaticPlatform() 
+PneumaticPlatform::~PneumaticPlatform()
 {
   if ((this == master) && (master)) {
     slave->master = 0;
@@ -86,7 +86,7 @@ void
 PneumaticPlatform::update(float elapsed_time)
 {
   if (!slave) {
-    Sector::current()->add_object(new PneumaticPlatform(this));
+    Sector::current()->add_object(std::make_shared<PneumaticPlatform>(this));
     return;
   }
   if (!master) {
@@ -105,8 +105,8 @@ PneumaticPlatform::update(float elapsed_time)
     speed_y -= (offset_y * elapsed_time * 0.5f);
     speed_y *= 1 - elapsed_time;
     offset_y += speed_y * elapsed_time;
-    if (offset_y < -256) { offset_y = -256; speed_y = 0; } 
-    if (offset_y > 256) { offset_y = 256; speed_y = -0; } 
+    if (offset_y < -256) { offset_y = -256; speed_y = 0; }
+    if (offset_y > 256) { offset_y = 256; speed_y = -0; }
     movement = Vector(0, (start_y + offset_y) - get_pos().y);
   }
 }