converted image management to resource handles

[chaz/yoink] / src / Hud.cc

diff --git a/src/Hud.cc b/src/Hud.cc
index d5ed41281c70e1f7f1d2bfd3d2b025e49d5c5114..58bc7210422e54b0b0a98fb03b1835277db8e90e 100644 (file)
--- a/src/Hud.cc
+++ b/src/Hud.cc
@@ -17,12 +17,11 @@
 #include "Hud.hh"
 
 
-ProgressBar::ProgressBar(const moof::texture& tilemap, int index) :
+ProgressBar::ProgressBar(const moof::sprite& tilemap, int index) :
        mProgress(0.0),
-       mTilemap(tilemap)
+       mTilemap(tilemap, index)
 {
-       tilemap.tile_coordinates(index, mTexCoords);
-
+       // TODO this is now broken
        moof::scalar half = (mTexCoords[2] - mTexCoords[0]) / 2.0 + mTexCoords[0];
        mMidCoords[0] = half - 0.01;
        mMidCoords[1] = half + 0.01;
@@ -105,8 +104,8 @@ void ProgressBar::draw(moof::scalar alpha) const
 
 Hud::Hud(GameState& state) :
        state_(state),
-       mBar1(moof::texture("StatusBars"), 0),
-       mBar2(moof::texture("StatusBars"), 2),
+       mBar1(moof::sprite("StatusBars"), 0),
+       mBar2(moof::sprite("StatusBars"), 2),
        mFont("Font")
 {
        moof::video* video = moof::video::current();