X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FGameLayer.hh;h=54b49962d0ab2a26a8ba4bb889ee9ee2564c5938;hp=c194e9f2935f87cec180c9f8f2c4960c4f188d85;hb=1fb5f7e36af1a4de040bc2989133703b0e0d4a9f;hpb=831f04d4bc19a390415ac0bbac4331c7a65509bc

diff --git a/src/GameLayer.hh b/src/GameLayer.hh
index c194e9f..54b4996 100644
--- a/src/GameLayer.hh
+++ b/src/GameLayer.hh
@@ -24,6 +24,7 @@
 #include <boost/shared_ptr.hpp>
 
 #include <moof/math.hh>
+#include <moof/mesh.hh>
 #include <moof/sound.hh>
 
 #include <moof/line.hh>		// TODO
@@ -71,12 +72,15 @@ private:
 
 	HudP			mHud;
 
-	moof::sound_stream	mMusic;
-	moof::sound 		mPunchSound;
+	//moof::sound_stream	mMusic;
+	moof::sound 	punch_sound_;
+	moof::sound		music_;
+
+	moof::mesh_handle	sceneMesh;
 
 	moof::ray2		mRay;
 	moof::line2		mLine;
-	moof::circle		mCircle;
+	moof::circle	mCircle;
 
 	moof::timer		mRayTimer;
 	void rayTimer();