X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fobject%2Fscripted_object.cpp;h=13e5f5f7594a4a730f6a61039c1866dde3196856;hb=058e2f6298d8319c0fe03c5e950a36a8f1f57aba;hp=009b4a51e9c52bafe1f6391fca02637abfdd708e;hpb=15c5a91ee89272dfda3666e2fed67e06d650d0bf;p=supertux.git

diff --git a/src/object/scripted_object.cpp b/src/object/scripted_object.cpp
index 009b4a51e..13e5f5f75 100644
--- a/src/object/scripted_object.cpp
+++ b/src/object/scripted_object.cpp
@@ -16,7 +16,6 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
 #include <config.h>
 
 #include <stdexcept>
@@ -28,15 +27,16 @@
 #include "resources.hpp"
 #include "object_factory.hpp"
 #include "math/vector.hpp"
+#include "sprite/sprite.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);
   if(name == "")
     throw std::runtime_error("Scripted object must have a name specified");
-  
+
   // FIXME: do we need this? bbox is already set via .sprite file
   float width = sprite->get_width();
   float height = sprite->get_height();
@@ -48,20 +48,24 @@ ScriptedObject::ScriptedObject(const lisp::Lisp& lisp)
   lisp.get("physic-enabled", physic_enabled);
   lisp.get("visible", visible);
   lisp.get("z-pos", layer);
-  if(solid)
-    flags |= FLAG_SOLID;
+  if( solid ){
+    set_group( COLGROUP_MOVING_STATIC );
+  } else {
+    set_group( COLGROUP_DISABLED );
+  }
 }
 
 void
 ScriptedObject::expose(HSQUIRRELVM vm, SQInteger table_idx)
 {
-  Scripting::ScriptedObject* interface = static_cast<Scripting::ScriptedObject*> (this);
-  expose_object(vm, table_idx, interface, name, false);
+  if (name.empty()) return;
+  expose_object(vm, table_idx, dynamic_cast<Scripting::ScriptedObject *>(this), name, false);
 }
 
 void
 ScriptedObject::unexpose(HSQUIRRELVM vm, SQInteger table_idx)
 {
+  if (name.empty()) return;
   Scripting::unexpose_object(vm, table_idx, name);
 }
 
@@ -74,7 +78,9 @@ 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));
+  physic.reset();
 }
 
 float
@@ -121,6 +127,24 @@ ScriptedObject::is_visible()
 }
 
 void
+ScriptedObject::set_solid(bool solid)
+{
+  this->solid = solid;
+  if( solid ){
+    set_group( COLGROUP_MOVING_STATIC );
+  } else {
+    set_group( COLGROUP_DISABLED );
+  }
+}
+
+bool
+ScriptedObject::is_solid()
+{
+  return solid;
+}
+
+
+void
 ScriptedObject::set_action(const std::string& animation)
 {
   sprite->set_action(animation);
@@ -160,30 +184,27 @@ ScriptedObject::draw(DrawingContext& context)
   sprite->draw(context, get_pos(), layer);
 }
 
-HitResponse
-ScriptedObject::collision(GameObject& other, const CollisionHit& hit)
+void
+ScriptedObject::collision_solid(const CollisionHit& hit)
 {
   if(!physic_enabled)
-    return FORCE_MOVE;
-
-  if(!(other.get_flags() & FLAG_SOLID))
-    return FORCE_MOVE;
-
-  if(other.get_flags() & FLAG_SOLID) {
-    if(hit.normal.y < 0) { // landed on floor
-      if(physic.get_velocity_y() < 0)
-        physic.set_velocity_y(0);
-    } else if(hit.normal.y > 0) { // bumped against roof
-      physic.set_velocity_y(.1);
-    }
-
-    if(fabsf(hit.normal.x) > .9) { // hit on side?
-      physic.set_velocity_x(0);
-    }
-        
-    return CONTINUE;
+    return;
+
+  if(hit.bottom) {
+    if(physic.get_velocity_y() > 0)
+      physic.set_velocity_y(0);
+  } else if(hit.top) {
+    physic.set_velocity_y(.1f);
   }
 
+  if(hit.left || hit.right) {
+    physic.set_velocity_x(0);
+  }
+}
+
+HitResponse
+ScriptedObject::collision(GameObject& , const CollisionHit& )
+{
   return FORCE_MOVE;
 }