#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 == "")
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;
}
std::string
ScriptedObject::get_action()
{
- return sprite->get_action_name();
+ return sprite->get_action();
}
std::string
if(!visible)
return;
- sprite->draw(context, get_pos(), layer);
+ sprite->draw(context, get_pos(), z_pos);
}
HitResponse