X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fobject%2Fscripted_object.cpp;h=b5ae6ed8989f85a2137629484552904ca083db37;hb=a6c19fc69bee325216222dca98dd8f466cdcf85a;hp=1a43a3a459f52c3d2ae2574b36af36c7ccf1bdaf;hpb=729bc6717bf68314dc9fad25db3a9f728062263e;p=supertux.git

diff --git a/src/object/scripted_object.cpp b/src/object/scripted_object.cpp
index 1a43a3a45..b5ae6ed89 100644
--- a/src/object/scripted_object.cpp
+++ b/src/object/scripted_object.cpp
@@ -27,9 +27,9 @@ ScriptedObject::ScriptedObject(const Reader& lisp) :
   MovingSprite(lisp, LAYER_OBJECTS, COLGROUP_MOVING_STATIC),
   physic(),
   name(),
-  solid(true), 
-  physic_enabled(true), 
-  visible(true), 
+  solid(true),
+  physic_enabled(true),
+  visible(true),
   new_vel_set(false),
   new_vel()
 {
@@ -47,7 +47,7 @@ ScriptedObject::ScriptedObject(const Reader& lisp) :
   lisp.get("solid", solid);
   lisp.get("physic-enabled", physic_enabled);
   lisp.get("visible", visible);
-  lisp.get("z-pos", layer);
+  layer = reader_get_layer (lisp, /* default = */ LAYER_OBJECTS);
   if( solid ){
     set_group( COLGROUP_MOVING_STATIC );
   } else {
@@ -78,8 +78,8 @@ ScriptedObject::move(float x, float y)
 void
 ScriptedObject::set_pos(float x, float y)
 {
-  printf("SetPos: %f %f\n", x, y);
-  bbox.set_pos(Vector(x, y));
+  // printf("SetPos: %f %f\n", x, y);
+  MovingObject::set_pos(Vector(x, y));
   physic.reset();
 }
 
@@ -115,9 +115,9 @@ ScriptedObject::get_velocity_y()
 }
 
 void
-ScriptedObject::set_visible(bool visible)
+ScriptedObject::set_visible(bool visible_)
 {
-  this->visible = visible;
+  this->visible = visible_;
 }
 
 bool
@@ -127,9 +127,9 @@ ScriptedObject::is_visible()
 }
 
 void
-ScriptedObject::set_solid(bool solid)
+ScriptedObject::set_solid(bool solid_)
 {
-  this->solid = solid;
+  this->solid = solid_;
   if( solid ){
     set_group( COLGROUP_MOVING_STATIC );
   } else {
@@ -143,6 +143,18 @@ ScriptedObject::is_solid()
   return solid;
 }
 
+bool
+ScriptedObject::gravity_enabled() const
+{
+	return physic.gravity_enabled();
+}
+
+void
+ScriptedObject::enable_gravity(bool f)
+{
+	physic.enable_gravity(f);
+}
+
 void
 ScriptedObject::set_action(const std::string& animation)
 {