X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FHeroine.cc;h=4ca4ce8702006cd46bd55c79ec5465d71f947fda;hp=c1c9f076d2b00eb9b6c0db09e61596b6e03df7de;hb=574af38ed616d1adfa5e6ce35f67cda1f707f89d;hpb=837bae9f2bf7b25e1d3d2625eeaf39c1d2f48827

diff --git a/src/Heroine.cc b/src/Heroine.cc
index c1c9f07..4ca4ce8 100644
--- a/src/Heroine.cc
+++ b/src/Heroine.cc
@@ -1,89 +1,87 @@
 
-/*]  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.
 *
-**************************************************************************/
+*****************************************************************************/
 
-#include <Moof/Sound.hh>
+#include <moof/log.hh>
+#include <moof/sound.hh>
 
 #include "Heroine.hh"
-#include "Log.hh"
-
 	
+
 Heroine::Heroine() :
 	Character("Heroine") {}
 
-
-void Heroine::update(Mf::Scalar t, Mf::Scalar dt)
+void Heroine::update(moof::scalar t, moof::scalar dt)
 {
 	Character::update(t, dt);
 
-	Mf::Vector3 at(0.0, 0.0, 0.0);
-	const Mf::Vector3 up(0.0, 1.0, 0.0);
+	moof::vector3		at(0.0, 0.0, 0.0);
+	const moof::vector3	up(0.0, 1.0, 0.0);
 
-	if (mState.velocity[0] < 0.0) at[0] = -1.0;
-	else                          at[0] = 1.0;
+	if (state_.velocity[0] < 0.0) at[0] = -1.0;
+	else at[0] = 1.0;
 
-	Mf::Sound::setListenerPosition(Mf::promote(mState.position));
-	Mf::Sound::setListenerVelocity(Mf::promote(mState.velocity));
-	Mf::Sound::setListenerOrientation(at, up);
+	moof::sound::listener_position(moof::promote(state_.position));
+	moof::sound::listener_velocity(moof::promote(state_.velocity));
+	moof::sound::listener_orientation(at, up);
 }
 
-
-bool Heroine::handleEvent(const Mf::Event& event)
+bool Heroine::handle_event(const moof::event& event)
 {
-	Mf::Scalar force = 40.0;
+	moof::scalar force = 40.0;
 	
 	switch (event.type)
 	{
-		case SDL_KEYDOWN:
-			if (event.key.keysym.sym == SDLK_a)
-			{
-				mState.force += Mf::Vector2(-force, 0.0);
-				return true;
-			}
-			else if (event.key.keysym.sym == SDLK_d)
-			{
-				mState.force += Mf::Vector2(force, 0.0);
-				return true;
-			}
-			else if (event.key.keysym.sym == SDLK_s)
-			{
-				mState.force += Mf::Vector2(0.0, -force);
-				return true;
-			}
-			else if (event.key.keysym.sym == SDLK_w)
-			{
-				mState.force += Mf::Vector2(0.0, force);
-				return true;
-			}
+	case SDL_KEYDOWN:
+		if (event.key.keysym.sym == SDLK_a)
+		{
+			state_.force += moof::vector2(-force, 0.0);
+			return true;
+		}
+		else if (event.key.keysym.sym == SDLK_d)
+		{
+			state_.force += moof::vector2(force, 0.0);
+			return true;
+		}
+		else if (event.key.keysym.sym == SDLK_s)
+		{
+			state_.force += moof::vector2(0.0, -force);
+			return true;
+		}
+		else if (event.key.keysym.sym == SDLK_w)
+		{
+			state_.force += moof::vector2(0.0, force);
+			return true;
+		}
+		break;
 
-		case SDL_KEYUP:
-			if (event.key.keysym.sym == SDLK_a)
-			{
-				mState.force += Mf::Vector2(force, 0.0);
-				return true;
-			}
-			else if (event.key.keysym.sym == SDLK_d)
-			{
-				mState.force += Mf::Vector2(-force, 0.0);
-				return true;
-			}
-			else if (event.key.keysym.sym == SDLK_s)
-			{
-				mState.force += Mf::Vector2(0.0, force);
-				return true;
-			}
-			else if (event.key.keysym.sym == SDLK_w)
-			{
-				mState.force += Mf::Vector2(0.0, -force);
-				return true;
-			}
+	case SDL_KEYUP:
+		if (event.key.keysym.sym == SDLK_a)
+		{
+			state_.force += moof::vector2(force, 0.0);
+			return true;
+		}
+		else if (event.key.keysym.sym == SDLK_d)
+		{
+			state_.force += moof::vector2(-force, 0.0);
+			return true;
+		}
+		else if (event.key.keysym.sym == SDLK_s)
+		{
+			state_.force += moof::vector2(0.0, force);
+			return true;
+		}
+		else if (event.key.keysym.sym == SDLK_w)
+		{
+			state_.force += moof::vector2(0.0, -force);
+			return true;
+		}
+		break;
 	}
 	return false;
 }