refactoring needed for win32 crash

[chaz/yoink] / src / Hud.hh

diff --git a/src/Hud.hh b/src/Hud.hh
index d3675a476c85b62dcb5782256dd2856bfce9f506..75ced92d0543816298435210b09222d3bda0d24a 100644 (file)
--- a/src/Hud.hh
+++ b/src/Hud.hh
@@ -39,7 +39,7 @@
 #include <Moof/Math.hh>
 #include <Moof/Rectangle.hh>
 
-#include "GameLayer.hh"
+#include "GameState.hh"
 #include "Tilemap.hh"
 
 
@@ -77,9 +77,9 @@ class Hud : public Mf::Layer
 {
 public:
 
-       Hud(GameLayer::State& state);
+       Hud(GameState& state);
 
-       static HudP alloc(GameLayer::State& state)
+       static HudP alloc(GameState& state)
        {
                return HudP(new Hud(state));
        }
@@ -100,13 +100,13 @@ 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:
 
-       GameLayer::State&               mState;
+       GameState&      mState;
 
        ProgressBar     mBar1;
        ProgressBar     mBar2;