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

Conflicts:
	pacman-c++/main.cpp
	pacman-c++/pacman.qrc

1 files changed, 9 insertions, 0 deletions

diff --git a/pacman-c++/main.cpp b/pacman-c++/main.cpp
index 14a3ee9..6f6e5df 100644
--- a/pacman-c++/main.cpp
+++ b/pacman-c++/main.cpp
@@ -1,4 +1,5 @@
 #include "actor.h"
+#include "block.h"
 #include <QtCore>
 #include <QtGui>
 
@@ -21,6 +22,14 @@ int main(int argc, char **argv)
   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);
+
   QGraphicsView *window = new QGraphicsView(&scene);
   window->setFrameStyle(0);
   window->setAlignment(Qt::AlignLeft | Qt::AlignTop);