Add some more sound_manager->preloads into object constructors

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

diff --git a/src/object/scripted_object.cpp b/src/object/scripted_object.cpp
index 07eebb3..ba0d114 100644 (file)
--- a/src/object/scripted_object.cpp
+++ b/src/object/scripted_object.cpp
@@ -24,28 +24,20 @@
 
 #include "scripted_object.hpp"
 #include "video/drawing_context.hpp"
-#include "sprite/sprite_manager.hpp"
 #include "scripting/squirrel_util.hpp"
 #include "resources.hpp"
 #include "object_factory.hpp"
 #include "math/vector.hpp"
 
 ScriptedObject::ScriptedObject(const lisp::Lisp& lisp)
-  : solid(true), physic_enabled(true), visible(true), new_vel_set(false),
-    layer(LAYER_OBJECTS)
+  : MovingSprite(lisp, LAYER_OBJECTS, COLGROUP_MOVING),
+    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");
   
-  std::string spritename;
-  lisp.get("sprite", spritename);
-  if(spritename == "")
-    throw std::runtime_error("Scripted object must have a sprite name specified");
-  sprite = sprite_manager->create(spritename);
-
-  lisp.get("x", bbox.p1.x);
-  lisp.get("y", bbox.p1.y);
+  // FIXME: do we need this? bbox is already set via .sprite file
   float width = sprite->get_width();
   float height = sprite->get_height();
   lisp.get("width", width);
@@ -55,25 +47,20 @@ ScriptedObject::ScriptedObject(const lisp::Lisp& lisp)
   lisp.get("solid", solid);
   lisp.get("physic-enabled", physic_enabled);
   lisp.get("visible", visible);
-  lisp.get("layer", layer);
+  lisp.get("z-pos", layer);
   if(solid)
     flags |= FLAG_SOLID;
 }
 
-ScriptedObject::~ScriptedObject()
-{
-  delete sprite;
-}
-
 void
-ScriptedObject::expose(HSQUIRRELVM vm, int table_idx)
+ScriptedObject::expose(HSQUIRRELVM vm, SQInteger table_idx)
 {
   Scripting::ScriptedObject* interface = static_cast<Scripting::ScriptedObject*> (this);
   expose_object(vm, table_idx, interface, name, false);
 }
 
 void
-ScriptedObject::unexpose(HSQUIRRELVM vm, int table_idx)
+ScriptedObject::unexpose(HSQUIRRELVM vm, SQInteger table_idx)
 {
   Scripting::unexpose_object(vm, table_idx, name);
 }
@@ -87,7 +74,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
@@ -134,6 +123,23 @@ ScriptedObject::is_visible()
 }
 
 void
+ScriptedObject::set_solid(bool solid)
+{
+  this->solid = solid;
+  if(solid)
+    flags |= FLAG_SOLID;
+  else
+    flags ^= FLAG_SOLID;
+}
+
+bool
+ScriptedObject::is_solid()
+{
+  return solid;
+}
+
+
+void
 ScriptedObject::set_action(const std::string& animation)
 {
   sprite->set_action(animation);
@@ -142,7 +148,7 @@ ScriptedObject::set_action(const std::string& animation)
 std::string
 ScriptedObject::get_action()
 {
-  return sprite->get_action_name();
+  return sprite->get_action();
 }
 
 std::string
@@ -184,7 +190,7 @@ ScriptedObject::collision(GameObject& other, const CollisionHit& hit)
 
   if(other.get_flags() & FLAG_SOLID) {
     if(hit.normal.y < 0) { // landed on floor
-      if(physic.get_velocity_y() < 0)
+      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);