X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FHud.hh;h=05882ed0121f439250925846594991335bb13cad;hp=7cf2504b7d4a376fe1888d25c3b76acda7542c84;hb=574af38ed616d1adfa5e6ce35f67cda1f707f89d;hpb=831f04d4bc19a390415ac0bbac4331c7a65509bc

diff --git a/src/Hud.hh b/src/Hud.hh
index 7cf2504..05882ed 100644
--- a/src/Hud.hh
+++ b/src/Hud.hh
@@ -1,13 +1,11 @@
 
-/*]  Copyright (c) 2009-2010, Charles McGarvey  [**************************
+/*]  Copyright (c) 2009-2011, Charles McGarvey  [*****************************
 **]  All rights reserved.
 *
-* vi:ts=4 sw=4 tw=75
-*
 * Distributable under the terms and conditions of the 2-clause BSD license;
 * see the file COPYING for a complete text of the license.
 *
-**************************************************************************/
+*****************************************************************************/
 
 #ifndef _HUD_HH_
 #define _HUD_HH_
@@ -20,12 +18,12 @@
 #include <moof/drawable.hh>
 #include <moof/math.hh>
 //#include <moof/rectangle.hh>
-#include <moof/texture.hh>
-#include <moof/view.hh>
+#include <moof/sprite.hh>
 
 #include "GameState.hh"
 
 
+// forward declarations
 class rectangle;
 
 // TODO this stuff is still just hacked up
@@ -34,7 +32,7 @@ class ProgressBar : public moof::drawable
 {
 public:
 
-	ProgressBar(const moof::texture& tilemap, int index);
+	ProgressBar(const moof::sprite& tilemap, int index);
 
 	void resize(const moof::rectangle& rect);
 
@@ -49,7 +47,7 @@ private:
 	moof::vector2	mVertices[8];
 	moof::scalar	mWidth;
 
-	moof::texture	mTilemap;
+	moof::sprite	mTilemap;
 	moof::scalar	mTexCoords[8];
 	moof::scalar	mMidCoords[2];
 };
@@ -58,7 +56,7 @@ private:
 class Hud;
 typedef boost::shared_ptr<Hud> HudP;
 
-class Hud : public moof::view
+class Hud
 {
 public:
 
@@ -97,7 +95,7 @@ private:
 	ProgressBar	mBar2;
 
 	unsigned	mNumber;
-	moof::texture	mFont;
+	moof::sprite	mFont;
 
 	moof::matrix4	mProjection;
 };