mesh and other random adjustments

[chaz/yoink] / src / GameLayer.hh

diff --git a/src/GameLayer.hh b/src/GameLayer.hh
index c194e9f2935f87cec180c9f8f2c4960c4f188d85..f3814430e72417f87cd007fe29f4ab23efec5656 100644 (file)
--- a/src/GameLayer.hh
+++ b/src/GameLayer.hh
@@ -61,22 +61,19 @@ private:
        void loadSceneLoader();
        void advanceScene(moof::settings& settings);
 
-       void thinkTimer();
-
        void projection();
        void projection(moof::scalar width, moof::scalar height);
 
-       GameState               state_;
-       moof::timer             mThinkTimer;
+       mutable GameState               state_;
 
        HudP                    mHud;
 
-       moof::sound_stream      mMusic;
-       moof::sound             mPunchSound;
+       moof::sound     punch_sound_;
+       moof::sound             music_;
 
        moof::ray2              mRay;
        moof::line2             mLine;
-       moof::circle            mCircle;
+       moof::circle    mCircle;
 
        moof::timer             mRayTimer;
        void rayTimer();