resource loading bugs and new sound class

[chaz/yoink] / src / GameLayer.hh

diff --git a/src/GameLayer.hh b/src/GameLayer.hh
index c194e9f2935f87cec180c9f8f2c4960c4f188d85..f2a70f97f43e0bbe1ca28f9ec395f769cc368013 100644 (file)
--- a/src/GameLayer.hh
+++ b/src/GameLayer.hh
@@ -71,12 +71,14 @@ private:
 
        HudP                    mHud;
 
-       moof::sound_stream      mMusic;
-       moof::sound             mPunchSound;
+       //moof::sound_stream    mMusic;
+       moof::sound     punch_sound_;
+       
+       moof::sound             music_;
 
        moof::ray2              mRay;
        moof::line2             mLine;
-       moof::circle            mCircle;
+       moof::circle    mCircle;
 
        moof::timer             mRayTimer;
        void rayTimer();