X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fscripted_object.cpp;h=56a1fd5da8ab784b98cebb39c9fff63d0a494ae8;hb=78ac7aef674f518549f96160c6354b589553f952;hp=82f72e98eaddaba64079595d2d63c77380ca1f90;hpb=2b18d7e2549f4be99533fed58c0f07887a19db37;p=supertux.git

diff --git a/src/object/scripted_object.cpp b/src/object/scripted_object.cpp
index 82f72e98e..56a1fd5da 100644
--- a/src/object/scripted_object.cpp
+++ b/src/object/scripted_object.cpp
@@ -1,29 +1,43 @@
-#include <config.h>
-
-#include <stdexcept>
-
-#include "scripted_object.h"
-#include "video/drawing_context.h"
-#include "sprite/sprite_manager.h"
-#include "resources.h"
-#include "object_factory.h"
-#include "math/vector.h"
-
-ScriptedObject::ScriptedObject(const lisp::Lisp& lisp)
-  : solid(true), physic_enabled(true), visible(true)
+//  SuperTux
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "object/scripted_object.hpp"
+
+#include <stdio.h>
+
+#include "scripting/squirrel_util.hpp"
+#include "sprite/sprite.hpp"
+#include "supertux/object_factory.hpp"
+#include "util/reader.hpp"
+
+ScriptedObject::ScriptedObject(const Reader& lisp) :
+  MovingSprite(lisp, LAYER_OBJECTS, COLGROUP_MOVING_STATIC),
+  physic(),
+  name(),
+  solid(true), 
+  physic_enabled(true), 
+  visible(true), 
+  new_vel_set(false),
+  new_vel()
 {
   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);
@@ -33,13 +47,26 @@ ScriptedObject::ScriptedObject(const lisp::Lisp& lisp)
   lisp.get("solid", solid);
   lisp.get("physic-enabled", physic_enabled);
   lisp.get("visible", visible);
-  if(solid)
-    flags |= FLAG_SOLID;
+  lisp.get("z-pos", layer);
+  if( solid ){
+    set_group( COLGROUP_MOVING_STATIC );
+  } else {
+    set_group( COLGROUP_DISABLED );
+  }
 }
 
-ScriptedObject::~ScriptedObject()
+void
+ScriptedObject::expose(HSQUIRRELVM vm, SQInteger table_idx)
 {
-  delete sprite;
+  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);
 }
 
 void
@@ -51,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
@@ -69,7 +98,8 @@ ScriptedObject::get_pos_y()
 void
 ScriptedObject::set_velocity(float x, float y)
 {
-  physic.set_velocity(x, y);
+  new_vel = Vector(x, y);
+  new_vel_set = true;
 }
 
 float
@@ -97,15 +127,32 @@ ScriptedObject::is_visible()
 }
 
 void
-ScriptedObject::set_animation(const std::string& animation)
+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);
 }
 
 std::string
-ScriptedObject::get_animation()
+ScriptedObject::get_action()
 {
-  return sprite->get_action_name();
+  return sprite->get_action();
 }
 
 std::string
@@ -115,11 +162,15 @@ ScriptedObject::get_name()
 }
 
 void
-ScriptedObject::action(float elapsed_time)
+ScriptedObject::update(float elapsed_time)
 {
   if(!physic_enabled)
     return;
 
+  if(new_vel_set) {
+    physic.set_velocity(new_vel.x, new_vel.y);
+    new_vel_set = false;
+  }
   movement = physic.get_movement(elapsed_time);
 }
 
@@ -129,20 +180,33 @@ ScriptedObject::draw(DrawingContext& context)
   if(!visible)
     return;
 
-  sprite->draw(context, get_pos(), LAYER_OBJECTS);
+  sprite->draw(context, get_pos(), layer);
 }
 
-HitResponse
-ScriptedObject::collision(GameObject& other, const CollisionHit& )
+void
+ScriptedObject::collision_solid(const CollisionHit& hit)
 {
   if(!physic_enabled)
-    return FORCE_MOVE;
+    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(!(other.get_flags() & FLAG_SOLID))
-    return FORCE_MOVE;
+  if(hit.left || hit.right) {
+    physic.set_velocity_x(0);
+  }
+}
 
-  physic.set_velocity(0, 0);
-  return CONTINUE;
+HitResponse
+ScriptedObject::collision(GameObject& , const CollisionHit& )
+{
+  return FORCE_MOVE;
 }
 
 IMPLEMENT_FACTORY(ScriptedObject, "scriptedobject");
+
+/* EOF */