X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2Fyoink.hh;h=8a2a28c13a7eb4abb883932e7984f507edd0911c;hp=cc4446a387875714cb950bb3769aaa5f54e15ed1;hb=44b3014bce798789e795242d1556cb7449e6386a;hpb=af88821a172c4dfd138b91b2a5148ae50b502fa2

diff --git a/src/yoink.hh b/src/yoink.hh
index cc4446a..8a2a28c 100644
--- a/src/yoink.hh
+++ b/src/yoink.hh
@@ -1,34 +1,26 @@
 
-/*]  Copyright (c) 2009-2010, Charles McGarvey  [**************************
+/*]  Copyright (c) 2009-2011, Charles McGarvey  [*****************************
 **]  All rights reserved.
 *
-* vi:ts=4 sw=4 tw=75
-*
 * Distributable under the terms and conditions of the 2-clause BSD license;
 * see the file COPYING for a complete text of the license.
 *
-**************************************************************************/
+*****************************************************************************/
 
 #ifndef _YOINK_HH_
 #define _YOINK_HH_
 
-/**
- * \file yoink.hh
- * This is the big enchilada.
- */
-
 #include <iostream>
 #include <string>
 #include <vector>
 
 #include <boost/shared_ptr.hpp>
 
-#include <moof/math.hh>
-#include <moof/sound.hh>
-
 #include <moof/line.hh>		// TODO
+#include <moof/math.hh>
 #include <moof/plane.hh>
 #include <moof/ray.hh>
+#include <moof/sound.hh>
 #include <moof/sphere.hh>
 #include <moof/timer.hh>
 
@@ -36,6 +28,11 @@
 #include "Hud.hh"
 
 
+/**
+ * \file yoink.hh
+ * This is the big enchilada.
+ */
+
 class yoink
 {
 public:
@@ -54,16 +51,16 @@ private:
 	void projection();
 	void projection(moof::scalar width, moof::scalar height);
 
-	mutable GameState		state_;
+	mutable GameState	state_;
 
 	HudP			mHud;
 
-	moof::sound 	punch_sound_;
+	moof::sound 		punch_sound_;
 	moof::sound		music_;
 
 	moof::ray2		mRay;
 	moof::line2		mLine;
-	moof::circle	mCircle;
+	moof::circle		mCircle;
 
 	moof::timer		mRayTimer;
 	void rayTimer();