X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FGameState.hh;h=66b7a7d938e1d9cbe5109a124404b4578b5e834d;hp=9583ff238af0aa1c470b23afb6d48f51a37ef6e6;hb=831f04d4bc19a390415ac0bbac4331c7a65509bc;hpb=299af4f2047e767e5d79501c26444473bda64c64

diff --git a/src/GameState.hh b/src/GameState.hh
index 9583ff2..66b7a7d 100644
--- a/src/GameState.hh
+++ b/src/GameState.hh
@@ -13,7 +13,7 @@
 #define _GAMESTATE_HH_
 
 /**
- * @file GameState.hh
+ * \file GameState.hh
  * The data.
  */
 
@@ -22,9 +22,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 +33,15 @@
 
 struct GameState
 {
-	Mf::Script					script;
+	moof::script				script;
 	std::vector<std::string>	sceneList;
 
 	HeroineP					heroine;
 	SceneP						scene;
 
-	Mf::Lerp					interp;
+	moof::lerp_scalar			interp;
 
-	Mf::Camera					camera;
+	moof::camera				camera;
 };