X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fscripted_object.cpp;h=eadcc43455b48bcf913bc8821bc482d9b4d60965;hb=04a3157ef478169b5a3fc05dae00ed6ee6a1fae2;hp=ee6000bbb0d5cad7943448b837c963e2e75d1a36;hpb=caf1fac28250de0cf57c703b6359e0a69730f2bf;p=supertux.git

diff --git a/src/object/scripted_object.cpp b/src/object/scripted_object.cpp
index ee6000bbb..eadcc4345 100644
--- a/src/object/scripted_object.cpp
+++ b/src/object/scripted_object.cpp
@@ -29,7 +29,7 @@
 #include "math/vector.hpp"
 
 ScriptedObject::ScriptedObject(const lisp::Lisp& lisp)
-  : MovingSprite(lisp, LAYER_OBJECTS, COLGROUP_MOVING),
+  : MovingSprite(lisp, LAYER_OBJECTS, COLGROUP_MOVING_STATIC),
     solid(true), physic_enabled(true), visible(true), new_vel_set(false)
 {
   lisp.get("name", name);
@@ -48,7 +48,7 @@ ScriptedObject::ScriptedObject(const lisp::Lisp& lisp)
   lisp.get("visible", visible);
   lisp.get("z-pos", layer);
   if( solid ){
-    set_group( COLGROUP_MOVING );
+    set_group( COLGROUP_MOVING_STATIC );
   } else {
     set_group( COLGROUP_DISABLED );
   }
@@ -130,7 +130,7 @@ ScriptedObject::set_solid(bool solid)
 {
   this->solid = solid;
   if( solid ){
-    set_group( COLGROUP_MOVING );
+    set_group( COLGROUP_MOVING_STATIC );
   } else {
     set_group( COLGROUP_DISABLED );
   }
@@ -193,7 +193,7 @@ ScriptedObject::collision_solid(const CollisionHit& hit)
     if(physic.get_velocity_y() > 0)
       physic.set_velocity_y(0);
   } else if(hit.top) {
-    physic.set_velocity_y(.1);
+    physic.set_velocity_y(.1f);
   }
 
   if(hit.left || hit.right) {