Merge branch 'master' of ssh://manuel.mausz.at/foop

2 files changed, 41 insertions, 2 deletions

diff --git a/pacman-c++/mainwidget.cpp b/pacman-c++/mainwidget.cpp
index b421c36..072d417 100644
--- a/pacman-c++/mainwidget.cpp
+++ b/pacman-c++/mainwidget.cpp
@@ -92,8 +92,14 @@ MainWidget::MainWidget()
   createGui();
   updateMap(createDummyMap());
 
-  connect(AudioPlayer::self(), SIGNAL(finished()), this, SLOT(startGame()));
-  AudioPlayer::self()->play(AudioPlayer::Intro);
+  //connect(AudioPlayer::self(), SIGNAL(finished()), this, SLOT(startGame()));
+  //AudioPlayer::self()->play(AudioPlayer::Intro);
+
+  QTimer *timer = new QTimer(this);
+  connect(timer, SIGNAL(timeout()), this, SLOT(tick()));
+  timer->start(100);
+
+  startGame();
 }
 
 void MainWidget::createGui()
@@ -286,6 +292,36 @@ 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;
+  }
+
+  QMapIterator<Color::Color, Actor*> i(m_actors);
+  while (i.hasNext())
+  {
+    i.next();
+    i.value()->move(mov);
+  }
+}
+
+
 void MainWidget::keyPressEvent(QKeyEvent* event)
 {
   if (!m_running)
@@ -294,6 +330,8 @@ void MainWidget::keyPressEvent(QKeyEvent* event)
   QWidget::keyPressEvent(event);
   m_currentKey = translateKey(event->key());
 
+  return;
+
   // test stuff
   Actor::Movement mov = Actor::None;
   switch(m_currentKey)
diff --git a/pacman-c++/mainwidget.h b/pacman-c++/mainwidget.h
index 8d21649..e7d146f 100644
--- a/pacman-c++/mainwidget.h
+++ b/pacman-c++/mainwidget.h
@@ -31,6 +31,7 @@ private:
 private slots:
   void startGame();
   void playerScoreClicked();
+  void tick();
 
 private:
   QVector< QVector<PixmapItem *> > visualMap;