X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FHud.cc;h=28b7c3487f8fbbbd0184bf725bd164f5ae5dafa6;hp=9e40a601a859f15f9a89a4243a008b0879bb3559;hb=14df8308778d04b49582a29d7a2866c7dbb9ccf9;hpb=837bae9f2bf7b25e1d3d2625eeaf39c1d2f48827

diff --git a/src/Hud.cc b/src/Hud.cc
index 9e40a60..28b7c34 100644
--- a/src/Hud.cc
+++ b/src/Hud.cc
@@ -9,7 +9,8 @@
 *
 **************************************************************************/
 
-#include <Moof/Core.hh>
+#include <Moof/Aabb.hh>
+#include <Moof/Log.hh>
 #include <Moof/OpenGL.hh>
 #include <Moof/Video.hh>
 
@@ -30,11 +31,12 @@ ProgressBar::ProgressBar(const Mf::Texture& tilemap,
 
 void ProgressBar::resize(const Mf::Rectangle& rect)
 {
+	Mf::logInfo << "rect: " << rect.min << ", " << rect.max << std::endl;
 	Mf::Scalar height = rect.max[1] - rect.min[1];
 	Mf::Scalar halfHeight = height / 2.0;
 
 	mWidth = rect.max[0] - rect.min[0] - height;
-	// assert width > 0
+	ASSERT(mWidth > 0);
 
 	mVertices[0] = rect.min;
 	mVertices[1] = Mf::Vector2(rect.min[0] + halfHeight, rect.min[1]);
@@ -108,9 +110,9 @@ Hud::Hud(GameState& state) :
 	mBar2(Mf::Texture("StatusBars"), 2),
 	mFont("Font")
 {
-	ASSERT(Mf::video &&
-		   "no current video context from which to get dimensions");
-	resize(Mf::video->getWidth(), Mf::video->getHeight());
+	Mf::Video* video = Mf::Video::current();
+	ASSERT(video && "a current video context should be set");
+	resize(video->getWidth(), video->getHeight());
 }
 
 
@@ -122,10 +124,8 @@ void Hud::resize(int width, int height)
 			SCALAR(1.0), SCALAR(-1.0), cml::z_clip_neg_one);
 
 	// position the two progress bars at the top-left of the screen
-	mBar1.resize(Mf::Rectangle(20, height - 51,
-				0.7 * width, height - 3));
-	mBar2.resize(Mf::Rectangle(20, height - 28,
-				0.7 * width, height - 70));
+	mBar1.resize(Mf::Rectangle(20, height - 51, 0.7 * width, height - 3));
+	mBar2.resize(Mf::Rectangle(20, height - 28, 0.7 * width, height - 70));
 
 	setBar1Progress(0.05);
 	setBar2Progress(0.0);
@@ -173,7 +173,9 @@ bool Hud::handleEvent(const Mf::Event& event)
 			if (event.key.keysym.sym == SDLK_h)
 			{
 				// don't want the hud anymore
-				Mf::core.pop(this);
+				parent().removeChild(this);
+
+				Mf::logWarning("okay bye bye hud");
 				return true;
 			}
 			break;