make it possible to start supertux from top soruce directory

[supertux.git] / lib / special / sprite.cpp

diff --git a/lib/special/sprite.cpp b/lib/special/sprite.cpp
index ac50b83..f6cbdeb 100644 (file)
--- a/lib/special/sprite.cpp
+++ b/lib/special/sprite.cpp
@@ -55,7 +55,9 @@ Sprite::~Sprite()
     {
     for(std::vector<Surface*>::iterator i_sur = i_act->second->surfaces.begin();
         i_sur != i_act->second->surfaces.end(); ++i_sur)
-      delete *i_sur;
+      {
+        delete *i_sur;
+      }
     delete i_act->second;
     }
 }
@@ -75,17 +77,7 @@ Sprite::parse_action(LispReader& lispreader)
   lispreader.read_int("z-order", action->z_order);
   lispreader.read_float("fps",     action->fps);
 
-  std::vector<std::string> images;
-  if(!lispreader.read_string_vector("images", images))
-    Termination::abort("Sprite contains no images: ", action->name.c_str());
-
-  for(std::vector<std::string>::size_type i = 0; i < images.size(); i++)
-    {
-      action->surfaces.push_back(
-          new Surface(datadir + "/images/" + images[i], true));
-    }
-
-  // TODO: add a top filter entry
+  /* TODO: add a top filter entry */
   std::vector <int> mask_color;
   lispreader.read_int_vector("apply-mask", mask_color);
   if(mask_color.size() == 4)
@@ -93,10 +85,41 @@ Sprite::parse_action(LispReader& lispreader)
     for(std::vector<Surface*>::iterator i = action->surfaces.begin();
         i < action->surfaces.end(); i++)
       {
-        (*i)->apply_mask(Color(mask_color));
+        (*i)->apply_filter(MASK_FILTER, Color(mask_color));
+      }
+    }
+
+  std::string mirror_action;
+  lispreader.read_string("mirror-action", mirror_action);
+  if(!mirror_action.empty())
+    {
+    Action* act_tmp = get_action(mirror_action);
+    if(act_tmp == NULL)
+      std::cerr << "Warning: Could not mirror action. Action not found\n"
+                   "Mirror actions must be defined after the real one!\n";
+    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), true);
+        surface->apply_filter(HORIZONTAL_FLIP_FILTER);
+        action->surfaces.push_back(surface);
+        }
       }
     }
+  else // Load images
+    {
+    std::vector<std::string> images;
+    if(!lispreader.read_string_vector("images", images))
+      Termination::abort("Sprite contains no images: ", action->name);
 
+    for(std::vector<std::string>::size_type i = 0; i < images.size(); i++)
+      {
+      action->surfaces.push_back(
+          new Surface(datadir + "/images/" + images[i], true));
+      }
+    }
   actions[action->name] = action;
 }
 
@@ -133,6 +156,18 @@ if(i == actions.end())
 action = i->second;
 }
 
+Sprite::Action*
+Sprite::get_action(std::string act)
+{
+Actions::iterator i = actions.find(act);
+if(i == actions.end())
+  {
+  std::cerr << "Warning: Action '" << act << "' not found on Sprite '" << name << "'\n";
+  return NULL;
+  }
+return i->second;
+}
+
 void
 Sprite::start_animation(int loops)
 {
@@ -238,8 +273,7 @@ Sprite::draw(DrawingContext& context, const Vector& pos, int layer,
               << "/" << get_action_name() << std::endl;
   else
     context.draw_surface(action->surfaces[(int)frame],
-            pos - Vector(action->x_offset, action->y_offset), layer + action->z_order,
-            drawing_effect);
+            pos - Vector(action->x_offset, action->y_offset), layer + action->z_order, drawing_effect);
 }
 
 void
@@ -254,8 +288,7 @@ Sprite::draw_part(DrawingContext& context, const Vector& source, const Vector& s
               << "/" << 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,
-            drawing_effect);
+            pos - Vector(action->x_offset, action->y_offset), layer + action->z_order, drawing_effect);
 }
 
 int