X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2FYoinkApp.hh;h=ad8d694e62619aee1c947e50f901e864310db95d;hb=57b78ebe21b1b48acd337daa5a1cb8c383959cfa;hp=b70cb4d3a289817729433a6cad940eb8b696efe1;hpb=4701bf580b75a7d77a460c6f14f9fc31fb109bbb;p=chaz%2Fyoink

diff --git a/src/YoinkApp.hh b/src/YoinkApp.hh
index b70cb4d..ad8d694 100644
--- a/src/YoinkApp.hh
+++ b/src/YoinkApp.hh
@@ -69,10 +69,9 @@ private:
 	void setupGL();
 	void contextRecreated(const Mf::Notification* note);
 
-	Mf::Lerps musicFade;
-	Mf::SoundStream music;
+	Mf::Sound music;
 
-	CharacterPtr heroine;
+	CharacterP heroine;
 	Mf::Sound punchSound;
 	TilemapFont *font;
 
@@ -80,10 +79,7 @@ private:
 	Mf::Lerps fadeIn;
 
 	Mf::Camera camera;
-	Mf::Scene* testScene;
-
-	Mf::Scalar state;
-	Mf::Scalar prevstate;
+	Mf::SceneP testScene;
 
 	Hud hud;
 };