- fixed missing angle init

[supertux.git] / src / sprite / sprite.cpp

diff --git a/src/sprite/sprite.cpp b/src/sprite/sprite.cpp
index 4a0adb3..00c6247 100644 (file)
--- a/src/sprite/sprite.cpp
+++ b/src/sprite/sprite.cpp
@@ -24,25 +24,29 @@
 #include <cassert>
 #include <stdexcept>
 
+
+#include "video/surface.hpp"
 #include "sprite.hpp"
 #include "video/drawing_context.hpp"
 #include "log.hpp"
+#include "timer.hpp"
 
 Sprite::Sprite(SpriteData& newdata)
-  : data(newdata), frame(0), animation_loops(-1)
+  : data(newdata), frame(0), animation_loops(-1), angle(0.0f)
 {
   action = data.get_action("normal");
   if(!action)
     action = data.actions.begin()->second;
-  last_ticks = SDL_GetTicks();
+  last_ticks = real_time;
 }
 
 Sprite::Sprite(const Sprite& other)
   : data(other.data), frame(other.frame),
     animation_loops(other.animation_loops),
+    angle(0.0f),
     action(other.action)
 {
-  last_ticks = SDL_GetTicks();
+  last_ticks = real_time;
 }
 
 Sprite::~Sprite()
@@ -78,9 +82,8 @@ Sprite::update()
   if(animation_done())
     return;
 
-  Uint32 ticks = SDL_GetTicks();
-  float frame_inc = action->fps * float(ticks - last_ticks)/1000.0;
-  last_ticks = ticks;
+  float frame_inc = action->fps * (real_time - last_ticks);
+  last_ticks = real_time;
 
   frame += frame_inc;
 
@@ -100,11 +103,12 @@ Sprite::draw(DrawingContext& context, const Vector& pos, int layer)
   update();
 
   if((int)frame >= get_frames() || (int)frame < 0)
-    log_warning << "frame out of range: " << (int)frame << "/" << get_frames() << " at " << get_name() << "/" << get_action_name() << std::endl;
+    log_warning << "frame out of range: " << (int)frame << "/" << get_frames() << " at " << get_name() << "/" << get_action() << std::endl;
   else
     context.draw_surface(action->surfaces[(int)frame],
-            pos - Vector(action->x_offset, action->y_offset),
-            layer + action->z_order);
+                         pos - Vector(action->x_offset, action->y_offset),
+                         angle,
+                         layer + action->z_order);
 }
 
 void
@@ -114,12 +118,20 @@ Sprite::draw_part(DrawingContext& context, const Vector& source,
   assert(action != 0);
   update();
 
-  if((int)frame >= get_frames() || (int)frame < 0)
-    log_warning << "frame out of range: " << (int)frame << "/" << get_frames() << " at sprite: " << get_name() << "/" << get_action_name() << std::endl;
-  else
-    context.draw_surface_part(action->surfaces[(int)frame], source, size,
-            pos - Vector(action->x_offset, action->y_offset),
-            layer + action->z_order);
+  int frameidx = (int) frame;
+  
+  if(frameidx >= get_frames() || frameidx < 0) {
+#ifndef DEBUG
+    // in optimized mode we get some small rounding errors in floating point
+    // number sometimes...
+    log_warning << "frame out of range: " << frameidx << "/" << get_frames() << " at sprite: " << get_name() << "/" << get_action() << std::endl;
+#endif
+    frameidx = get_frames() - 1;
+  }
+    
+  context.draw_surface_part(action->surfaces[frameidx], source, size,
+      pos - Vector(action->x_offset, action->y_offset),
+      layer + action->z_order);
 }
 
 int
@@ -134,10 +146,52 @@ Sprite::get_height() const
   return (int) action->surfaces[get_frame()]->get_height();
 }
 
+float
+Sprite::get_current_hitbox_x_offset() const
+{
+  return action->x_offset;
+}
+
+float
+Sprite::get_current_hitbox_y_offset() const
+{
+  return action->y_offset;
+}
+
+float
+Sprite::get_current_hitbox_width() const
+{
+  return action->hitbox_w;
+}
+
+float
+Sprite::get_current_hitbox_height() const
+{
+  return action->hitbox_h;
+}
+
+Rect
+Sprite::get_current_hitbox() const
+{
+  return Rect(action->x_offset, action->y_offset, action->x_offset + action->hitbox_w, action->y_offset + action->hitbox_h);
+}
+
 void
 Sprite::set_fps(float new_fps)
 {
   action->fps = new_fps;
 }
 
+void
+Sprite::set_angle(float a)
+{
+  angle = a;
+}
+
+float
+Sprite::get_angle() const
+{
+  return angle;
+}
 
+/* EOF */