X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FYoinkApp.hh;h=1613707730ea0d6a3efc7d499556d73d162e65a5;hp=66406d2d4447c0979ddb0ef94f1bced85da45569;hb=bfa6212d09d8735d8fd5e2638188e4a99f21ada4;hpb=eebb993ca929c3f4c235cad9e01dc4797fcd2945

diff --git a/src/YoinkApp.hh b/src/YoinkApp.hh
index 66406d2..1613707 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
 {
@@ -65,19 +69,22 @@ private:
 	void setupGL();
 	void contextRecreated(const Mf::Notification& note);
 
-	Character* someChar;
+	Mf::SoundStream music;
+
+	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;
 };