X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FYoinkApp.hh;h=ad8d694e62619aee1c947e50f901e864310db95d;hp=66406d2d4447c0979ddb0ef94f1bced85da45569;hb=57b78ebe21b1b48acd337daa5a1cb8c383959cfa;hpb=29e3d45f7bbbf31eadf793c41ff2b3d9c47b7539

diff --git a/src/YoinkApp.hh b/src/YoinkApp.hh
index 66406d2..ad8d694 100644
--- a/src/YoinkApp.hh
+++ b/src/YoinkApp.hh
@@ -47,6 +47,10 @@
 #include "Character.hh"
 #include "TilemapFont.hh"
 
+#include <Moof/Sound.hh>
+
+#include "Hud.hh"
+
 
 class YoinkApp : public Mf::Engine
 {
@@ -63,21 +67,21 @@ private:
 	 * Set OpenGL to a state we can know and depend on.
 	 */
 	void setupGL();
-	void contextRecreated(const Mf::Notification& note);
+	void contextRecreated(const Mf::Notification* note);
 
-	Character* someChar;
+	Mf::Sound music;
+
+	CharacterP heroine;
+	Mf::Sound punchSound;
 	TilemapFont *font;
 
-	Mf::Cerpv2 interp;
+	Mf::Cerps interp;
 	Mf::Lerps fadeIn;
 
 	Mf::Camera camera;
-	Mf::Scene* testScene;
-
-	Mf::Scalar x, y, z;
+	Mf::SceneP testScene;
 
-	Mf::Scalar state;
-	Mf::Scalar prevstate;
+	Hud hud;
 };