beginning CD implementation

[chaz/yoink] / src / GameLayer.cc

diff --git a/src/GameLayer.cc b/src/GameLayer.cc
index c763b0fbbf04edce32967a867d13973780f57646..e7ab9e849a4b100773e7c550bf7ab7280d4dc737 100644 (file)
--- 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: