Turned a lot of other global objects into Currentons

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

diff --git a/src/sprite/sprite_data.cpp b/src/sprite/sprite_data.cpp
index 6d2d2a5..b777cda 100644 (file)
--- a/src/sprite/sprite_data.cpp
+++ b/src/sprite/sprite_data.cpp
@@ -21,6 +21,7 @@
 
 #include "lisp/list_iterator.hpp"
 #include "util/log.hpp"
+#include "util/reader.hpp"
 
 SpriteData::Action::Action() :
   name(),
@@ -42,21 +43,18 @@ SpriteData::Action::Action() :
 
 SpriteData::Action::~Action()
 {
-  for(std::vector<Surface*>::iterator i = surfaces.begin();
-      i != surfaces.end(); ++i)
-    delete *i;
 }
 
-SpriteData::SpriteData(const lisp::Lisp* lisp, const std::string& basedir) :
+SpriteData::SpriteData(const Reader& lisp, const std::string& basedir) :
   actions(),
   name()
 {
-  lisp::ListIterator iter(lisp);
+  lisp::ListIterator iter(&lisp);
   while(iter.next()) {
     if(iter.item() == "name") {
       iter.value()->get(name);
     } else if(iter.item() == "action") {
-      parse_action(iter.lisp(), basedir);
+      parse_action(*iter.lisp(), basedir);
     } else {
       log_warning << "Unknown sprite field: " << iter.item() << std::endl;
     }
@@ -72,49 +70,58 @@ SpriteData::~SpriteData()
 }
 
 void
-SpriteData::parse_action(const lisp::Lisp* lisp, const std::string& basedir)
+SpriteData::parse_action(const Reader& lisp, const std::string& basedir)
 {
   Action* action = new Action;
 
-  if(!lisp->get("name", action->name)) {
+  if(!lisp.get("name", action->name)) {
     if(!actions.empty())
       throw std::runtime_error(
         "If there are more than one action, they need names!");
   }
   std::vector<float> hitbox;
-  if (lisp->get("hitbox", hitbox)) {
-    if (hitbox.size() != 4) throw std::runtime_error("hitbox must specify exactly 4 coordinates");
-    action->x_offset = hitbox[0];
-    action->y_offset = hitbox[1];
-    action->hitbox_w = hitbox[2];
-    action->hitbox_h = hitbox[3];
+  if (lisp.get("hitbox", hitbox)) {
+    switch(hitbox.size()) {
+      case 4:
+        action->hitbox_h = hitbox[3];
+        action->hitbox_w = hitbox[2];
+
+        //fall-through
+      case 2:
+        action->y_offset = hitbox[1];
+        action->x_offset = hitbox[0];
+        break;
+
+      default:
+        throw std::runtime_error("hitbox should specify 2/4 coordinates");
+    }
   }
-  lisp->get("z-order", action->z_order);
-  lisp->get("fps", action->fps);
+  lisp.get("z-order", action->z_order);
+  lisp.get("fps", action->fps);
 
   std::string mirror_action;
-  lisp->get("mirror-action", mirror_action);
+  lisp.get("mirror-action", mirror_action);
   if(!mirror_action.empty()) {
-    Action* act_tmp = get_action(mirror_action);
+    const Action* act_tmp = get_action(mirror_action);
     if(act_tmp == NULL) {
-      throw std::runtime_error("Could not mirror action. Action not found\n"
+      throw std::runtime_error("Could not mirror action. Action not found.\n"
                                "Mirror actions must be defined after the real one!");
     } else {
       float max_w = 0;
       float max_h = 0;
       for(int i = 0; static_cast<unsigned int>(i) < act_tmp->surfaces.size(); i++) {
-        Surface* surface = new Surface(*(act_tmp->surfaces[i]));
+        SurfacePtr surface = act_tmp->surfaces[i]->clone();
         surface->hflip();
         max_w = std::max(max_w, (float) surface->get_width());
         max_h = std::max(max_h, (float) surface->get_height());
         action->surfaces.push_back(surface);
       }
-      if (action->hitbox_w < 1) action->hitbox_w = max_w;
-      if (action->hitbox_h < 1) action->hitbox_h = max_h;
+      if (action->hitbox_w < 1) action->hitbox_w = max_w - action->x_offset;
+      if (action->hitbox_h < 1) action->hitbox_h = max_h - action->y_offset;
     }
   } else { // Load images
     std::vector<std::string> images;
-    if(!lisp->get("images", images)) {
+    if(!lisp.get("images", images)) {
       std::stringstream msg;
       msg << "Sprite '" << name << "' contains no images in action '"
           << action->name << "'.";
@@ -124,19 +131,19 @@ SpriteData::parse_action(const lisp::Lisp* lisp, const std::string& basedir)
     float max_w = 0;
     float max_h = 0;
     for(std::vector<std::string>::size_type i = 0; i < images.size(); i++) {
-      Surface* surface = new Surface(basedir + images[i]);
+      SurfacePtr surface = Surface::create(basedir + images[i]);
       max_w = std::max(max_w, (float) surface->get_width());
       max_h = std::max(max_h, (float) surface->get_height());
       action->surfaces.push_back(surface);
     }
-    if (action->hitbox_w < 1) action->hitbox_w = max_w;
-    if (action->hitbox_h < 1) action->hitbox_h = max_h;
+    if (action->hitbox_w < 1) action->hitbox_w = max_w - action->x_offset;
+    if (action->hitbox_h < 1) action->hitbox_h = max_h - action->y_offset;
   }
   actions[action->name] = action;
 }
 
-SpriteData::Action*
-SpriteData::get_action(std::string act)
+const SpriteData::Action*
+SpriteData::get_action(const std::string act)
 {
   Actions::iterator i = actions.find(act);
   if(i == actions.end()) {