svn merge -c-4932 .

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

diff --git a/src/object/wind.cpp b/src/object/wind.cpp
index fff0b79..638ab69 100644 (file)
--- a/src/object/wind.cpp
+++ b/src/object/wind.cpp
@@ -29,8 +29,10 @@
 #include "scripting/wind.hpp"
 #include "scripting/squirrel_util.hpp"
 
-Wind::Wind(const lisp::Lisp& reader) : name(""), blowing(true), acceleration(100), elapsed_time(0)
+Wind::Wind(const lisp::Lisp& reader)
+  : blowing(true), acceleration(100), elapsed_time(0)
 {
+  reader.get("name", name);
   reader.get("x", bbox.p1.x);
   reader.get("y", bbox.p1.y);
   float w = 32, h = 32;
@@ -38,7 +40,6 @@ Wind::Wind(const lisp::Lisp& reader) : name(""), blowing(true), acceleration(100
   reader.get("height", h);
   bbox.set_size(w, h);
 
-  reader.get("name", name);
   reader.get("blowing", blowing);
 
   float speed_x = 0, speed_y = 0;
@@ -63,7 +64,7 @@ Wind::update(float elapsed_time)
     // emit a particle
     Vector ppos = Vector(systemRandom.randf(bbox.p1.x+8, bbox.p2.x-8), systemRandom.randf(bbox.p1.y+8, bbox.p2.y-8));
     Vector pspeed = Vector(speed.x, speed.y);
-    Sector::current()->add_object(new Particles(ppos, 44, 46, pspeed, Vector(0,0), 1, Color(.4, .4, .4), 3, .1, LAYER_BACKGROUNDTILES+1));
+    Sector::current()->add_object(new Particles(ppos, 44, 46, pspeed, Vector(0,0), 1, Color(.4f, .4f, .4f), 3, .1f, LAYER_BACKGROUNDTILES+1));
   }
 }
 
@@ -90,7 +91,9 @@ Wind::collision(GameObject& other, const CollisionHit& )
 void
 Wind::expose(HSQUIRRELVM vm, SQInteger table_idx)
 {
-  if (name == "") return;
+  if (name == "")
+    return;
+
   Scripting::Wind* interface = new Scripting::Wind(this);
   expose_object(vm, table_idx, interface, name, true);
 }
@@ -98,7 +101,9 @@ Wind::expose(HSQUIRRELVM vm, SQInteger table_idx)
 void
 Wind::unexpose(HSQUIRRELVM vm, SQInteger table_idx)
 {
-  if (name == "") return;
+  if (name == "")
+    return;
+
   Scripting::unexpose_object(vm, table_idx, name);
 }