X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FHud.hh;h=2262b062983ae1d8faedc89bdc0cdcda21aaa270;hp=016767a5a8ba48ee97bff20743c16645c3eab692;hb=e973a129b5b83b628ba3f09e8c95682fc74080cd;hpb=a295f8def17036c8071b56e181364f99a377cae7

diff --git a/src/Hud.hh b/src/Hud.hh
index 016767a..2262b06 100644
--- 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];
 };
@@ -100,9 +100,9 @@ public:
 
 	void resize(int width, int height);
 
-	void update(Mf::Engine& engine, Mf::Scalar t, Mf::Scalar dt);
-	void draw(Mf::Engine& engine, Mf::Scalar alpha = 0.0) const;
-	bool handleEvent(Mf::Engine& engine, const Mf::Event& event);
+	void update(Mf::Scalar t, Mf::Scalar dt);
+	void draw(Mf::Scalar alpha = 0.0) const;
+	bool handleEvent(const Mf::Event& event);
 
 private:
 
@@ -112,7 +112,7 @@ private:
 	ProgressBar	mBar2;
 
 	unsigned	mNumber;
-	Tilemap		mFont;
+	Mf::Texture	mFont;
 
 	Mf::Matrix4	mProjection;
 };