the massive refactoring effort

[chaz/yoink] / src / GameState.hh

diff --git a/src/GameState.hh b/src/GameState.hh
index 9583ff238af0aa1c470b23afb6d48f51a37ef6e6..66b7a7d938e1d9cbe5109a124404b4578b5e834d 100644 (file)
--- 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;
 };