X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FGameState.hh;h=ecf9e05e08b60af28a0dfc07847d52bb42756ad6;hp=9583ff238af0aa1c470b23afb6d48f51a37ef6e6;hb=574af38ed616d1adfa5e6ce35f67cda1f707f89d;hpb=837bae9f2bf7b25e1d3d2625eeaf39c1d2f48827

diff --git a/src/GameState.hh b/src/GameState.hh
index 9583ff2..ecf9e05 100644
--- a/src/GameState.hh
+++ b/src/GameState.hh
@@ -1,19 +1,17 @@
 
-/*]  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 _GAMESTATE_HH_
 #define _GAMESTATE_HH_
 
 /**
- * @file GameState.hh
+ * \file GameState.hh
  * The data.
  */
 
@@ -22,9 +20,9 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include <Moof/Camera.hh>
-#include <Moof/Interpolator.hh>
-#include <Moof/Script.hh>
+#include <moof/camera.hh>
+#include <moof/interpolator.hh>
+#include <moof/script.hh>
 
 #include "Character.hh"
 #include "Heroine.hh"
@@ -33,15 +31,15 @@
 
 struct GameState
 {
-	Mf::Script					script;
+	moof::script			script;
 	std::vector<std::string>	sceneList;
 
-	HeroineP					heroine;
-	SceneP						scene;
+	HeroineP			heroine;
+	SceneP				scene;
 
-	Mf::Lerp					interp;
+	moof::lerp_scalar		interp;
 
-	Mf::Camera					camera;
+	moof::camera			camera;
 };