X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fsprite.cpp;h=bb31251a8becf225554b29f1983bab43813eaa2e;hb=2ec1be264110139466ab70422b8f4fd9c22e5c8c;hp=b5a091dbe7247e03abf823cd724f06643a06bce9;hpb=5af08553c4cfa80081b85909b4a9cdc3b01f9cb9;p=supertux.git

diff --git a/src/sprite.cpp b/src/sprite.cpp
index b5a091dbe..bb31251a8 100644
--- a/src/sprite.cpp
+++ b/src/sprite.cpp
@@ -18,8 +18,10 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <iostream>
+#include <math.h>
 #include "globals.h"
 #include "sprite.h"
+#include "setup.h"
 
 Sprite::Sprite(lisp_object_t* cur)
 {
@@ -27,22 +29,32 @@ Sprite::Sprite(lisp_object_t* cur)
 
   LispReader reader(cur);
 
-  reader.read_string("name",   &name);
+  if(!reader.read_string("name",   &name))
+    st_abort("Sprite wihtout name", "");
   reader.read_int("x-hotspot", &x_hotspot);
   reader.read_int("y-hotspot", &y_hotspot);
   reader.read_float("fps",     &fps);
+
   std::vector<std::string> images;
-  reader.read_string_vector("images", &images);
-  surfaces.resize(images.size());
+  if(!reader.read_string_vector("images", &images))
+    st_abort("Sprite contains no images: ", name.c_str());
 
   for(std::vector<std::string>::size_type i = 0; i < images.size(); ++i)
     {
-      surfaces[i] = new Surface(datadir + "/images/" + images[i], USE_ALPHA);
+      surfaces.push_back(
+          new Surface(datadir + "/images/" + images[i], USE_ALPHA));
     }        
 
   frame_delay = 1000.0f/fps;
 }
 
+Sprite::~Sprite()
+{
+  for(std::vector<Surface*>::iterator i = surfaces.begin(); i != surfaces.end();
+      ++i)
+    delete *i;
+}
+
 void
 Sprite::init_defaults()
 {
@@ -71,6 +83,16 @@ Sprite::draw(float x, float y)
 }
 
 void
+Sprite::draw_part(float sx, float sy, float x, float y, float w, float h)
+{
+  time = SDL_GetTicks();
+  unsigned int frame = get_current_frame();
+
+  if (frame < surfaces.size())
+    surfaces[frame]->draw_part(sx, sy, x - x_hotspot, y - y_hotspot, w, h);
+}
+
+void
 Sprite::reset()
 {
   time = 0;