Draw bouncy coin above other objects

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

diff --git a/src/object/scripted_object.cpp b/src/object/scripted_object.cpp
index 928b350..67ca8b1 100644 (file)
--- a/src/object/scripted_object.cpp
+++ b/src/object/scripted_object.cpp
@@ -1,3 +1,22 @@
+//  $Id$
+//
+//  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 2
+//  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, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #include <config.h>
 
 #include <stdexcept>
@@ -6,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 == "")
@@ -36,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;
 }
@@ -123,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
@@ -151,7 +170,7 @@ ScriptedObject::draw(DrawingContext& context)
   if(!visible)
     return;
 
-  sprite->draw(context, get_pos(), layer);
+  sprite->draw(context, get_pos(), z_pos);
 }
 
 HitResponse