X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FHud.cc;h=58bc7210422e54b0b0a98fb03b1835277db8e90e;hp=d5ed41281c70e1f7f1d2bfd3d2b025e49d5c5114;hb=382626aad0a683ed8642a6a807eea743db45f7f8;hpb=1da520638918096276158ecdfaeebc14a3d70be7 diff --git a/src/Hud.cc b/src/Hud.cc index d5ed412..58bc721 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();