added some utility

1 files changed, 11 insertions, 22 deletions

diff --git a/pacman-c++/sceneholder.cpp b/pacman-c++/sceneholder.cpp
index 83025d5..ba9cc97 100644
--- a/pacman-c++/sceneholder.cpp
+++ b/pacman-c++/sceneholder.cpp
@@ -6,6 +6,7 @@
 #include "actor.h"
 #include "bonuspoint.h"
 #include "point.h"
+#include "util.h"
 
 SceneHolder::SceneHolder(QWidget* parent): QWidget(parent)
 {
@@ -66,27 +67,8 @@ void SceneHolder::updateMap(const Transmission::map_t& map)
           actor->setPos(mapPositionToCoord(x, y));
         }
 
-        Actor::Movement direction = Actor::None;
-        switch (cur & Transmission::direction_mask)
-        {
-        case Transmission::direction_none:
-          direction = Actor::None;
-          break;
-        case Transmission::direction_left:
-          direction = Actor::Left;
-          break;
-        case Transmission::direction_right:
-          direction = Actor::Right;
-          break;
-        case Transmission::direction_up:
-          direction = Actor::Up;
-          break;
-        case Transmission::direction_down:
-          direction = Actor::Down;
-          break;
-        default:
-          Q_ASSERT(false);
-        }
+        Actor::Movement direction =
+          Util::transmissionMovementToActor(cur & Transmission::direction_mask);
         //actor->move(direction, mapPositionToCoord(x, y));
       }
       else
@@ -112,4 +94,11 @@ void SceneHolder::updateMap(const Transmission::map_t& map)
 QPoint SceneHolder::mapPositionToCoord(unsigned int x, unsigned int y)
 {
   return QPoint(x * Constants::field_size.width, y * Constants::field_size.height);
-}
\ No newline at end of file
+}
+
+QPoint SceneHolder::CoordToMapPosition(unsigned int x, unsigned int y)
+{
+  return QPoint(x / Constants::field_size.width, y / Constants::field_size.height);
+}
+
+