Unified Messaging Subsystem

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

diff --git a/src/sprite/sprite_data.cpp b/src/sprite/sprite_data.cpp
index a4597e5..90a9e4e 100644 (file)
--- a/src/sprite/sprite_data.cpp
+++ b/src/sprite/sprite_data.cpp
@@ -27,6 +27,7 @@
 #include "resources.hpp"
 #include "video/drawing_context.hpp"
 #include "lisp/list_iterator.hpp"
+#include "msg.hpp"
 
 SpriteData::Action::Action()
 {
@@ -43,20 +44,18 @@ SpriteData::Action::~Action()
     delete *i;
 }
 
-SpriteData::SpriteData(const lisp::Lisp* lisp)
+SpriteData::SpriteData(const lisp::Lisp* lisp, const std::string& basedir)
 {
   lisp::ListIterator iter(lisp);
   while(iter.next()) {
     if(iter.item() == "name") {
       iter.value()->get(name);
     } else if(iter.item() == "action") {
-      parse_action(iter.lisp());
+      parse_action(iter.lisp(), basedir);
     } else {
-      std::cerr << "Unknown sprite field: " << iter.item() << "\n";
+      msg_warning("Unknown sprite field: " << iter.item());
     }
   }
-  if(name.empty())
-    throw std::runtime_error("Error: Sprite wihtout name.");
   if(actions.empty())
     throw std::runtime_error("Error: Sprite wihtout actions.");
 }
@@ -68,7 +67,7 @@ SpriteData::~SpriteData()
 }
 
 void
-SpriteData::parse_action(const lisp::Lisp* lisp)
+SpriteData::parse_action(const lisp::Lisp* lisp, const std::string& basedir)
 {
   Action* action = new Action;
 
@@ -92,9 +91,8 @@ SpriteData::parse_action(const lisp::Lisp* lisp)
     } else {
       for(int i = 0; static_cast<unsigned int>(i) < act_tmp->surfaces.size();
           i++) {
-        Surface* surface = new Surface(sdl_surface_from_sdl_surface(
-              act_tmp->surfaces[i]->impl->get_sdl_surface()), true);
-        surface->apply_filter(HORIZONTAL_FLIP_FILTER);
+        Surface* surface = new Surface(*(act_tmp->surfaces[i]));
+        surface->hflip();
         action->surfaces.push_back(surface);
       }
     }
@@ -108,7 +106,7 @@ SpriteData::parse_action(const lisp::Lisp* lisp)
     }
 
     for(std::vector<std::string>::size_type i = 0; i < images.size(); i++) {
-      action->surfaces.push_back(new Surface("images/" + images[i], true));
+      action->surfaces.push_back(new Surface(basedir + images[i]));
     }
   }
   actions[action->name] = action;