fixed some resource management bugs

[chaz/yoink] / src / moof / sprite.cc

diff --git a/src/moof/sprite.cc b/src/moof/sprite.cc
index 7548ab0b8b7ae7b975b4f88bb1f66222240e241c..ee5db1dd302023072a93b7d0b534be37dd3da4e7 100644 (file)
--- a/src/moof/sprite.cc
+++ b/src/moof/sprite.cc
@@ -15,6 +15,7 @@
 
 #include <boost/algorithm/string.hpp>
 #include <boost/bind.hpp>
+#include <stlplus/portability/file_system.hpp>
 
 #include "dispatcher.hh"
 #include "log.hh"
@@ -25,16 +26,16 @@
 namespace moof {
 
 
-sprite::sprite(const std::string& path, int tile)
+sprite::sprite(const std::string& name, int tile)
 {
-       image_ = resource::load(path);
-       image_->tile_coordinates(tile, tile_);
+       image(name);
+       sprite::tile(tile);
 }
 
 sprite::sprite(const image_handle& image, int tile) :
        image_(image)
 {
-       image_->tile_coordinates(tile, tile_);
+       sprite::tile(tile);
 }
 
 sprite::sprite(const sprite& sprite, int tile)
@@ -44,10 +45,9 @@ sprite::sprite(const sprite& sprite, int tile)
 }
 
 
-void sprite::image(const std::string& path)
+void sprite::image(const std::string& name)
 {
-       image_ = resource::load(path);
-       // FIXME what about tiles?
+       image_ = resource::load(name, "png");
 }
 
 void sprite::tile(int tile)