X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FHud.hh;h=2262b062983ae1d8faedc89bdc0cdcda21aaa270;hp=75ced92d0543816298435210b09222d3bda0d24a;hb=e973a129b5b83b628ba3f09e8c95682fc74080cd;hpb=4f9eb9259092994de9690cf12f11437c35a6791e diff --git a/src/Hud.hh b/src/Hud.hh index 75ced92..2262b06 100644 --- a/src/Hud.hh +++ b/src/Hud.hh @@ -38,9 +38,9 @@ #include #include #include +#include #include "GameState.hh" -#include "Tilemap.hh" // TODO this stuff is still just hacked up @@ -49,7 +49,7 @@ class ProgressBar : public Mf::Drawable { public: - ProgressBar(const Tilemap& tilemap, Tilemap::Index index); + ProgressBar(const Mf::Texture& tilemap, Mf::Texture::TileIndex index); void resize(const Mf::Rectangle& rect); @@ -64,7 +64,7 @@ private: Mf::Vector2 mVertices[8]; Mf::Scalar mWidth; - Tilemap mTilemap; + Mf::Texture mTilemap; Mf::Scalar mTexCoords[8]; Mf::Scalar mMidCoords[2]; }; @@ -112,7 +112,7 @@ private: ProgressBar mBar2; unsigned mNumber; - Tilemap mFont; + Mf::Texture mFont; Mf::Matrix4 mProjection; };