New GameObject SpriteParticle

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

diff --git a/src/object/scripted_object.cpp b/src/object/scripted_object.cpp
index f315174..feace6c 100644 (file)
--- a/src/object/scripted_object.cpp
+++ b/src/object/scripted_object.cpp
@@ -25,14 +25,14 @@
 #include "scripted_object.hpp"
 #include "video/drawing_context.hpp"
 #include "sprite/sprite_manager.hpp"
-#include "scripting/wrapper_util.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)
+    z_pos(LAYER_OBJECTS)
 {
   lisp.get("name", name);
   if(name == "")
@@ -55,7 +55,7 @@ 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", z_pos);
   if(solid)
     flags |= FLAG_SOLID;
 }
@@ -66,14 +66,14 @@ ScriptedObject::~ScriptedObject()
 }
 
 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);
 }
@@ -142,7 +142,7 @@ ScriptedObject::set_action(const std::string& animation)
 std::string
 ScriptedObject::get_action()
 {
-  return sprite->get_action_name();
+  return sprite->get_action();
 }
 
 std::string
@@ -170,7 +170,7 @@ ScriptedObject::draw(DrawingContext& context)
   if(!visible)
     return;
 
-  sprite->draw(context, get_pos(), layer);
+  sprite->draw(context, get_pos(), z_pos);
 }
 
 HitResponse