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

diff --git a/src/GameLayer.cc b/src/GameLayer.cc
index c763b0f..e7ab9e8 100644
--- a/src/GameLayer.cc
+++ b/src/GameLayer.cc
@@ -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));
@@ -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: