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

Conflicts:
	pacman-c++/actor.cpp
	pacman-c++/constants.h
	pacman-c++/mainwidget.cpp

1 files changed, 7 insertions, 3 deletions

diff --git a/pacman-c++/mainwidget.h b/pacman-c++/mainwidget.h
index 0a97116..0056669 100644
--- a/pacman-c++/mainwidget.h
+++ b/pacman-c++/mainwidget.h
@@ -21,10 +21,14 @@ protected:
   virtual void keyReleaseEvent(QKeyEvent* );
 
 private:
-  void loadDummyMap();
+  void createGui();
+  
+  void updateMap(const Transmission::map_t& map);
 
   void updateScore();
 
+  Transmission::map_t currentMap;
+
   // data conversion
   QPoint mapPositionToCoord(unsigned int x, unsigned int y);
 
@@ -36,10 +40,10 @@ private:
   QMap<Color::Color, Actor*> m_actors;
 
   // key currently pressed by user
-  transmission::field_t currentKey;
+  Transmission::field_t currentKey;
 
   // translate Qt::Key to our key format
-  transmission::field_t translateKey(int);
+  Transmission::field_t translateKey(int);
 };
 
 #endif // MAINWIDGET_H