refactoring needed for win32 crash

[chaz/yoink] / src / Hud.cc

diff --git a/src/Hud.cc b/src/Hud.cc
index d77bf57bd88146de508d155fa9a2c23dbc1f89d4..1fdf39bcd0075874027fc9c129b6ad00f5486ede 100644 (file)
--- a/src/Hud.cc
+++ b/src/Hud.cc
@@ -26,7 +26,7 @@
 
 *******************************************************************************/
 
-#include <Moof/Engine.hh>
+#include <Moof/Core.hh>
 #include <Moof/OpenGL.hh>
 #include <Moof/Video.hh>
 
@@ -124,8 +124,8 @@ Hud::Hud(GameState& state) :
        mBar2(Tilemap("StatusBars"), 2),
        mFont("Font")
 {
-       Mf::VideoP video = Mf::engine.getVideo();
-       resize(video->getWidth(), video->getHeight());
+       ASSERT(Mf::video && "no current video context from which to get dimensions");
+       resize(Mf::video->getWidth(), Mf::video->getHeight());
 }
 
 
@@ -147,14 +147,14 @@ void Hud::resize(int width, int height)
 }
 
 
-void Hud::update(Mf::Engine& engine, Mf::Scalar t, Mf::Scalar dt)
+void Hud::update(Mf::Scalar t, Mf::Scalar dt)
 {
        mState.interp.update(t, dt);
        setBar1Progress(mState.interp.getState(dt));
        setBar2Progress(1.0 - mState.interp.getState(dt));
 }
 
-void Hud::draw(Mf::Engine& engine, Mf::Scalar alpha) const
+void Hud::draw(Mf::Scalar alpha) const
 {
        glMatrixMode(GL_PROJECTION);
        glPushMatrix();
@@ -180,7 +180,7 @@ void Hud::draw(Mf::Engine& engine, Mf::Scalar alpha) const
        glPopMatrix();
 }
 
-bool Hud::handleEvent(Mf::Engine& engine, const Mf::Event& event)
+bool Hud::handleEvent(const Mf::Event& event)
 {
        switch (event.type)
        {
@@ -188,7 +188,7 @@ bool Hud::handleEvent(Mf::Engine& engine, const Mf::Event& event)
                        if (event.key.keysym.sym == SDLK_h)
                        {
                                // don't want the hud anymore
-                               engine.pop(this);
+                               Mf::core.pop(this);
                                return true;
                        }
                        break;