preliminary cleanup of character class

[chaz/yoink] / src / Heroine.cc

diff --git a/src/Heroine.cc b/src/Heroine.cc
index 314f2c984090c013ca697916079f731750dfc81e..7a751a017715e7291f5e30027a478c79350a049f 100644 (file)
--- a/src/Heroine.cc
+++ b/src/Heroine.cc
@@ -26,8 +26,6 @@
 
 *******************************************************************************/
 
-#include <iostream>
-
 #include "Heroine.hh"
 #include "Log.hh"
 
@@ -36,60 +34,57 @@ Heroine::Heroine() :
        Character("Heroine") {}
 
 
-void Heroine::handleEvent(const Mf::Event& event)
+bool Heroine::handleEvent(const Mf::Event& event)
 {
-       // really just for heroine...
-       
        Mf::Scalar force = 4000.0;
        
-       Mf::Vector2 left = Mf::Vector2(-force, 0.0);
-       Mf::Vector2 right = Mf::Vector2(force, 0.0);
-       Mf::Vector2 down = Mf::Vector2(0.0, -force);
-       Mf::Vector2 up = Mf::Vector2(0.0, force);
-
        switch (event.type)
        {
                case SDL_KEYDOWN:
                        if (event.key.keysym.sym == SDLK_a)
                        {
-                               userForce += left;
+                               current.force += Mf::Vector2(-force, 0.0);
+                               return true;
                        }
                        else if (event.key.keysym.sym == SDLK_d)
                        {
-                               userForce += right;
+                               current.force += Mf::Vector2(force, 0.0);
+                               return true;
                        }
                        else if (event.key.keysym.sym == SDLK_s)
                        {
-                               userForce += down;
+                               current.force += Mf::Vector2(0.0, -force);
+                               return true;
                        }
                        else if (event.key.keysym.sym == SDLK_w)
                        {
-                               userForce += up;
+                               current.force += Mf::Vector2(0.0, force);
+                               return true;
                        }
-                       break;
 
                case SDL_KEYUP:
                        if (event.key.keysym.sym == SDLK_a)
                        {
-                               userForce -= left;
+                               current.force += Mf::Vector2(force, 0.0);
+                               return true;
                        }
                        else if (event.key.keysym.sym == SDLK_d)
                        {
-                               userForce -= right;
+                               current.force += Mf::Vector2(-force, 0.0);
+                               return true;
                        }
                        else if (event.key.keysym.sym == SDLK_s)
                        {
-                               userForce -= down;
+                               current.force += Mf::Vector2(0.0, force);
+                               return true;
                        }
                        else if (event.key.keysym.sym == SDLK_w)
                        {
-                               userForce -= up;
+                               current.force += Mf::Vector2(0.0, -force);
+                               return true;
                        }
-                       break;
        }
-
-       //Mf::logInfo("current force [%f %f]", current.force[0], current.force[1]);
-       //std::cerr << "current force: " << current.force << std::endl;
+       return false;
 }