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

diff --git a/src/YoinkApp.hh b/src/YoinkApp.hh
index 66406d2..b70cb4d 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,25 @@ 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);
+
+	Mf::Lerps musicFade;
+	Mf::SoundStream music;
 
-	Character* someChar;
+	CharacterPtr 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::Scalar state;
 	Mf::Scalar prevstate;
+
+	Hud hud;
 };