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

1 files changed, 12 insertions, 0 deletions

diff --git a/pacman-c++/server.h b/pacman-c++/server.h
index 826c701..dc8de88 100644
--- a/pacman-c++/server.h
+++ b/pacman-c++/server.h
@@ -38,6 +38,12 @@ protected:
   void colorizeBlocks(Transmission::map_t map);
   void botCalculate(Actor *actor);
 
+protected slots:
+  // TODO: call this when a pacman get's eaten
+  void onRoundFinished(); // called when a round is finished
+protected:
+  void initRoundMap(bool firstPacket = false); // creates new round map
+
 protected:
   QMap<Color::Color, QTcpSocket *> m_clientConnections;
   QList<Color::Color> m_bots;
@@ -56,7 +62,13 @@ protected:
   QHostAddress m_bindaddress;
   unsigned int m_port;
   unsigned int m_maxplayers;
+  unsigned int m_rounds; // number of rounds (>= 1)
   unsigned int m_numbots;
+
+  unsigned int m_curRound; // current round starting with 0
+
+  QTimer *m_tickTimer;
+
 };
 
 #endif // SERVER_H