more featureful sound class

[chaz/yoink] / src / YoinkApp.hh

diff --git a/src/YoinkApp.hh b/src/YoinkApp.hh
index 1613707730ea0d6a3efc7d499556d73d162e65a5..ad8d694e62619aee1c947e50f901e864310db95d 100644 (file)
--- a/src/YoinkApp.hh
+++ b/src/YoinkApp.hh
@@ -67,11 +67,11 @@ 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::SoundStream music;
+       Mf::Sound music;
 
-       CharacterPtr heroine;
+       CharacterP heroine;
        Mf::Sound punchSound;
        TilemapFont *font;
 
@@ -79,10 +79,7 @@ private:
        Mf::Lerps fadeIn;
 
        Mf::Camera camera;
-       Mf::Scene* testScene;
-
-       Mf::Scalar state;
-       Mf::Scalar prevstate;
+       Mf::SceneP testScene;
 
        Hud hud;
 };