X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FHud.cc;h=cc25dd582171a80551192c1148f65bba4a378a12;hb=af88821a172c4dfd138b91b2a5148ae50b502fa2;hp=d5ed41281c70e1f7f1d2bfd3d2b025e49d5c5114;hpb=831f04d4bc19a390415ac0bbac4331c7a65509bc;p=chaz%2Fyoink

diff --git a/src/Hud.cc b/src/Hud.cc
index d5ed412..cc25dd5 100644
--- 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();
@@ -172,7 +171,7 @@ bool Hud::handle_event(const moof::event& event)
 			if (event.key.keysym.sym == SDLK_h)
 			{
 				// don't want the hud anymore
-				parent().remove_child(this);
+				//parent().remove_child(this);
 
 				moof::log_warning("okay bye bye hud");
 				return true;