added some utility

1 files changed, 3 insertions, 37 deletions

diff --git a/pacman-c++/mainwidget.cpp b/pacman-c++/mainwidget.cpp
index 34ff63e..79648c5 100644
--- a/pacman-c++/mainwidget.cpp
+++ b/pacman-c++/mainwidget.cpp
@@ -12,7 +12,7 @@ MainWidget::MainWidget(QWidget *parent)
   : SceneHolder(parent), m_currentKey(0), m_running(false)
 {
   createGui();
-  updateMap(createDummyMap());
+  updateMap(Util::createDummyMap());
 
   //connect(AudioPlayer::self(), SIGNAL(finished()), this, SLOT(startGame()));
   //AudioPlayer::self()->play(AudioPlayer::Intro);
@@ -123,24 +123,7 @@ Transmission::field_t MainWidget::translateKey(int key)
 
 void MainWidget::tick()
 {
-  Actor::Movement mov = Actor::None;
-  switch(m_currentKey)
-  {
-    case Transmission::direction_up:
-      mov = Actor::Up;
-      break;
-    case Transmission::direction_down:
-      mov = Actor::Down;
-      break;
-    case Transmission::direction_left:
-      mov = Actor::Left;
-      break;
-    case Transmission::direction_right:
-      mov = Actor::Right;
-      break;
-    default:
-      break;
-  }
+  Actor::Movement mov = Util::transmissionMovementToActor(m_currentKey, Actor::None);
 
   QMapIterator<Color::Color, Actor*> i(m_actors);
   while (i.hasNext())
@@ -169,24 +152,7 @@ void MainWidget::keyPressEvent(QKeyEvent* event)
   return;
 
   // test stuff
-  Actor::Movement mov = Actor::None;
-  switch(m_currentKey)
-  {
-  case Transmission::direction_up:
-    mov = Actor::Up;
-    break;
-  case Transmission::direction_down:
-    mov = Actor::Down;
-    break;
-  case Transmission::direction_left:
-    mov = Actor::Left;
-    break;
-  case Transmission::direction_right:
-    mov = Actor::Right;
-    break;
-  default:
-    break;
-  }
+  Actor::Movement mov = Util::transmissionMovementToActor(m_currentKey, Actor::None);
 
   QMapIterator<Color::Color, Actor*> i(m_actors);
   while (i.hasNext())