X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FHud.cc;h=d77bf57bd88146de508d155fa9a2c23dbc1f89d4;hp=90f5dd9418dd90f85bb25bc72ef631d0af5ebf90;hb=a295f8def17036c8071b56e181364f99a377cae7;hpb=e495074443d9fd7bc16137084cf9de3d031b75c4

diff --git a/src/Hud.cc b/src/Hud.cc
index 90f5dd9..d77bf57 100644
--- a/src/Hud.cc
+++ b/src/Hud.cc
@@ -88,43 +88,43 @@ void ProgressBar::draw(Mf::Scalar alpha) const
 	mTilemap.bind();
 
 	glBegin(GL_QUADS);
-		glTexCoord2(mTexCoords[0], mTexCoords[1]);
-		glVertex2v(mVertices[0].data());
-		glTexCoord2(mMidCoords[0], mTexCoords[3]);
-		glVertex2v(mVertices[1].data());
-		glTexCoord2(mMidCoords[0], mTexCoords[5]);
-		glVertex2v(mVertices[6].data());
-		glTexCoord2(mTexCoords[6], mTexCoords[7]);
-		glVertex2v(mVertices[7].data());
-
-		glTexCoord2(mMidCoords[0], mTexCoords[1]);
-		glVertex2v(mVertices[1].data());
-		glTexCoord2(mMidCoords[1], mTexCoords[3]);
-		glVertex2v(mVertices[2].data());
-		glTexCoord2(mMidCoords[1], mTexCoords[5]);
-		glVertex2v(mVertices[5].data());
-		glTexCoord2(mMidCoords[0], mTexCoords[7]);
-		glVertex2v(mVertices[6].data());
-
-		glTexCoord2(mMidCoords[1], mTexCoords[1]);
-		glVertex2v(mVertices[2].data());
-		glTexCoord2(mTexCoords[2], mTexCoords[3]);
-		glVertex2v(mVertices[3].data());
-		glTexCoord2(mTexCoords[4], mTexCoords[5]);
-		glVertex2v(mVertices[4].data());
-		glTexCoord2(mMidCoords[1], mTexCoords[7]);
-		glVertex2v(mVertices[5].data());
+		glTexCoord(mTexCoords[0], mTexCoords[1]);
+		glVertex(mVertices[0]);
+		glTexCoord(mMidCoords[0], mTexCoords[3]);
+		glVertex(mVertices[1]);
+		glTexCoord(mMidCoords[0], mTexCoords[5]);
+		glVertex(mVertices[6]);
+		glTexCoord(mTexCoords[6], mTexCoords[7]);
+		glVertex(mVertices[7]);
+
+		glTexCoord(mMidCoords[0], mTexCoords[1]);
+		glVertex(mVertices[1]);
+		glTexCoord(mMidCoords[1], mTexCoords[3]);
+		glVertex(mVertices[2]);
+		glTexCoord(mMidCoords[1], mTexCoords[5]);
+		glVertex(mVertices[5]);
+		glTexCoord(mMidCoords[0], mTexCoords[7]);
+		glVertex(mVertices[6]);
+
+		glTexCoord(mMidCoords[1], mTexCoords[1]);
+		glVertex(mVertices[2]);
+		glTexCoord(mTexCoords[2], mTexCoords[3]);
+		glVertex(mVertices[3]);
+		glTexCoord(mTexCoords[4], mTexCoords[5]);
+		glVertex(mVertices[4]);
+		glTexCoord(mMidCoords[1], mTexCoords[7]);
+		glVertex(mVertices[5]);
 	glEnd();
 }
 
 
-Hud::Hud(GameLayer::State& state) :
+Hud::Hud(GameState& state) :
 	mState(state),
 	mBar1(Tilemap("StatusBars"), 0),
 	mBar2(Tilemap("StatusBars"), 2),
 	mFont("Font")
 {
-	Mf::VideoP video = Mf::Engine::getInstance().getVideo();
+	Mf::VideoP video = Mf::engine.getVideo();
 	resize(video->getWidth(), video->getHeight());
 }