11 files changed, 27 insertions, 11 deletions

diff --git a/pacman-c++/actor.cpp b/pacman-c++/actor.cpp
index e98545b..4704ed1 100644
--- a/pacman-c++/actor.cpp
+++ b/pacman-c++/actor.cpp
@@ -18,9 +18,10 @@ static QVariant myBooleanInterpolator(const bool &start, const bool &end, qreal
 Actor::Actor(Type type)
   : m_type(type), m_direction(Actor::None)
 {
-  m_pix  = ":/" + QString("actor%1").arg(type);
-  setPixmap(m_pix);
+  m_pix  = ":/" + QString("actor%1").arg(m_type);
   setSprite(82, 82, SPRITE_PLAYER_WIDTH, SPRITE_PLAYER_HEIGHT);
+  // higher player "over" lower player
+  setZValue(m_type * 10);
 
   m_direction = Actor::Left;
 
@@ -36,6 +37,7 @@ Actor::Actor(Type type)
     int x = i * 20 + SPRITE_MARGIN;
     int y = m_direction * 20 + SPRITE_MARGIN;
     img->setSprite(x, y, SPRITE_PLAYER_WIDTH, SPRITE_PLAYER_HEIGHT);
+    img->setZValue(zValue());
     img->setVisible(false);
     img->setPos(QPointF(200, 0));
 
@@ -50,7 +52,7 @@ Actor::Actor(Type type)
     fadeout->setEndValue(false);
 
     QPropertyAnimation *move = new QPropertyAnimation(img, "pos", moving);
-    move->setDuration(10000);
+    move->setDuration(5000);
     move->setEndValue(QPointF(0, 0));
   }
 
diff --git a/pacman-c++/actor.h b/pacman-c++/actor.h
index 43314a9..f5844bb 100644
--- a/pacman-c++/actor.h
+++ b/pacman-c++/actor.h
@@ -16,9 +16,10 @@ public:
   };
 
   enum Type {
-    Player1 = 1,
-    Player2,
-    Player3,
+    Player1 = 1, // red
+    Player2,     // blue
+    Player3,     // green
+    Player4,     // yellow
   };
 
   Actor(Type type);
diff --git a/pacman-c++/block.cpp b/pacman-c++/block.cpp
index 69f2cd3..11c2a32 100644
--- a/pacman-c++/block.cpp
+++ b/pacman-c++/block.cpp
@@ -2,6 +2,7 @@
 
 #include <Qt>
 
-Block::Block(Actor::Type type) {
+Block::Block(Actor::Type type)
+{
   setPixmap(QPixmap(":/" + QString("block%1").arg(type)));
 }
diff --git a/pacman-c++/block.h b/pacman-c++/block.h
index 17f5903..25a331c 100644
--- a/pacman-c++/block.h
+++ b/pacman-c++/block.h
@@ -11,4 +11,4 @@ public:
 
 };
 
-#endif  // BLOCK_H
\ No newline at end of file
+#endif  // BLOCK_H
diff --git a/pacman-c++/main.cpp b/pacman-c++/main.cpp
index 2d3ff67..6f6e5df 100644
--- a/pacman-c++/main.cpp
+++ b/pacman-c++/main.cpp
@@ -1,6 +1,5 @@
 #include "actor.h"
 #include "block.h"
-#include "pixmapitem.h"
 #include <QtCore>
 #include <QtGui>
 
@@ -15,6 +14,18 @@ int main(int argc, char **argv)
   scene.addItem(actor1);
   actor1->setPos(100, 100);
 
+  Actor *actor2 = new Actor(Actor::Player2);
+  scene.addItem(actor2);
+  actor2->setPos(120, 100);
+
+  Actor *actor3 = new Actor(Actor::Player3);
+  scene.addItem(actor3);
+  actor3->setPos(140, 100);
+
+  Actor *actor4 = new Actor(Actor::Player4);
+  scene.addItem(actor4);
+  actor4->setPos(160, 100);
+
   Block *block1 = new Block(Actor::Player1);
   scene.addItem(block1);
   block1->setPos(200, 200);
diff --git a/pacman-c++/pacman.qrc b/pacman-c++/pacman.qrc
index 15c7985..6a7fefb 100644
--- a/pacman-c++/pacman.qrc
+++ b/pacman-c++/pacman.qrc
@@ -1,7 +1,9 @@
 <RCC>
     <qresource prefix="/">
-        <file alias="google-pacman-sprite">pics/pacman10-hp-sprite-2.png</file>
         <file alias="actor1">pics/actor1.png</file>
+        <file alias="actor2">pics/actor2.png</file>
+        <file alias="actor3">pics/actor3.png</file>
+        <file alias="actor4">pics/actor4.png</file>
         <file alias="block1">pics/block1.png</file>
     </qresource>
 </RCC>
diff --git a/pacman-c++/pics/actor1.png b/pacman-c++/pics/actor1.png
index 2b4a32a..b1304cd 100644
--- a/pacman-c++/pics/actor1.png
+++ b/pacman-c++/pics/actor1.png
diff --git a/pacman-c++/pics/actor2.png b/pacman-c++/pics/actor2.png
new file mode 100644
index 0000000..cac3786
--- /dev/null
+++ b/pacman-c++/pics/actor2.png
diff --git a/pacman-c++/pics/actor3.png b/pacman-c++/pics/actor3.png
new file mode 100644
index 0000000..99e025c
--- /dev/null
+++ b/pacman-c++/pics/actor3.png
diff --git a/pacman-c++/pics/actor4.png b/pacman-c++/pics/actor4.png
new file mode 100644
index 0000000..9947f9b
--- /dev/null
+++ b/pacman-c++/pics/actor4.png
diff --git a/pacman-c++/pixmapitem.cpp b/pacman-c++/pixmapitem.cpp
index b0a81d0..84517c2 100644
--- a/pacman-c++/pixmapitem.cpp
+++ b/pacman-c++/pixmapitem.cpp
@@ -1,6 +1,5 @@
 #include "pixmapitem.h"
 #include <QPainter>
-#include <QDebug>
 
 PixmapItem::PixmapItem(QGraphicsItem *parent)
   : QGraphicsObject(parent), m_x(0), m_y(0)