X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FGameState.hh;h=66b7a7d938e1d9cbe5109a124404b4578b5e834d;hp=bc59eaff30cd2b1c168a8918a5a76cf0d6c96590;hb=1d4aa0d34b0410c7bc60a24bad7abb55eacc850a;hpb=4f9eb9259092994de9690cf12f11437c35a6791e

diff --git a/src/GameState.hh b/src/GameState.hh
index bc59eaf..66b7a7d 100644
--- a/src/GameState.hh
+++ b/src/GameState.hh
@@ -1,44 +1,30 @@
 
-/*******************************************************************************
-
- Copyright (c) 2009, Charles McGarvey
- All rights reserved.
- 
- Redistribution   and   use  in  source  and  binary  forms,  with  or  without
- modification, are permitted provided that the following conditions are met:
- 
-   * Redistributions  of  source  code  must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-   * Redistributions  in binary form must reproduce the above copyright notice,
-     this  list of conditions and the following disclaimer in the documentation
-     and/or other materials provided with the distribution.
- 
- THIS  SOFTWARE  IS  PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND  ANY  EXPRESS  OR  IMPLIED  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED.  IN  NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR  ANY  DIRECT,  INDIRECT,  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES  (INCLUDING,  BUT  NOT  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES;  LOSS  OF  USE,  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED  AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
+/*]  Copyright (c) 2009-2010, 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.
  */
 
+#include <string>
+#include <vector>
+
 #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"
@@ -47,19 +33,17 @@
 
 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;
 };
 
 
 #endif // _GAMESTATE_HH_
 
-/** vim: set ts=4 sw=4 tw=80: *************************************************/
-