library class revamped as manager, goodbye tilemap

[chaz/yoink] / src / Hud.hh

diff --git a/src/Hud.hh b/src/Hud.hh
index 75ced92d0543816298435210b09222d3bda0d24a..2262b062983ae1d8faedc89bdc0cdcda21aaa270 100644 (file)
--- a/src/Hud.hh
+++ b/src/Hud.hh
@@ -38,9 +38,9 @@
 #include <Moof/Layer.hh>
 #include <Moof/Math.hh>
 #include <Moof/Rectangle.hh>
+#include <Moof/Texture.hh>
 
 #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;
 };