X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FGameLayer.cc;h=e7ab9e849a4b100773e7c550bf7ab7280d4dc737;hp=33710696107bd5f0f8b4c91ef0867384e34c5b6e;hb=64bd443538f57ad1bdff6c6b35953e72141129b2;hpb=a4debfe4a5f5d339410788971b698ba00cb7f09c

diff --git a/src/GameLayer.cc b/src/GameLayer.cc
index 3371069..e7ab9e8 100644
--- a/src/GameLayer.cc
+++ b/src/GameLayer.cc
@@ -48,7 +48,7 @@ GameLayer::GameLayer() :
 	music.stream();
 
 	heroine = Heroine::alloc();
-	heroine->getAnimation().startSequence("FlyDiagonallyUp");
+	heroine->animation.startSequence("FlyDiagonallyUp");
 
 	Mf::Scalar a[6] = {0.0, 1.5, -0.5, 3.0, -2.0, 1.0};
 	interp.init(a, 2.0, Mf::Interpolator::OSCILLATE);
@@ -72,6 +72,8 @@ void GameLayer::update(Mf::Scalar t, Mf::Scalar dt)
 	camera.update(t, dt);
 	heroine->update(t, dt);
 
+	scene->checkForCollision(*heroine);
+
 	//camera.lookAt(heroine->getSphere().point);
 	camera.setPosition(Mf::Vector3(-heroine->current.position[0],
 				-heroine->current.position[1], -256));
@@ -107,7 +109,7 @@ bool GameLayer::handleEvent(const Mf::Event& event)
 		case SDL_KEYDOWN:
 			if (event.key.keysym.sym == SDLK_SPACE)
 			{
-				heroine->getAnimation().startSequence("Flattened");
+				heroine->animation.startSequence("Flattened");
 				Mf::logInfo("thump!");
 				punchSound.play();
 				return true;
@@ -124,8 +126,7 @@ bool GameLayer::handleEvent(const Mf::Event& event)
 			}
 
 		case SDL_KEYUP:
-			heroine->handleEvent(event);
-			break;
+			return heroine->handleEvent(event);
 
 		case SDL_MOUSEMOTION:
 		case SDL_MOUSEBUTTONDOWN: