Blinker

@@ -0,0 +1 @@

+9

@@ -29,6 +29,8 @@ namespace Blinker {

 /// descriptor for delay value

 Pong::ValueDescr const Pong::c_delayDescr = { 200, 100, 500 };

+/// descriptor for maximum score value

+Pong::ValueDescr const Pong::c_maxScoreDescr = { 9, 1, 99 };

 /// operator connection name suffix for left player's connection

 std::string const Pong::c_opConnSuffixLeft = "/left";

@@ -50,9 +52,10 @@ Pong::Pong(const std::string &name, Mgrs &mgrs, const Directory &dirBase):

   m_fileScoreColor(dirBase.getFile("scoreColor")),

   m_fileGoalColor(dirBase.getFile("goalColor")),

   m_fileDelay(dirBase.getFile("delay")),

+  m_fileMaxScore(dirBase.getFile("maxScore")),

   m_ballColor(), m_lineColor(), m_padColor(), m_computerColor(),

   m_scoreColor(), m_goalColor(),

-  m_delay(c_delayDescr.default_),

+  m_delay(c_delayDescr.default_), m_maxScore(c_maxScoreDescr.default_),

   m_pConnLeft(NULL), m_pConnRight(NULL),

   m_ballPosX(-1), m_ballPosY(-1), m_ballDirX(0), m_ballDirY(0),

   m_padSize(0), m_leftPosY(0), m_rightPosY(0), m_leftDelay(0), m_rightDelay(0),

@@ -96,7 +99,8 @@ bool Pong::updateConfigGame()

       colorUpdate(m_fileComputerColor, m_computerColor) ||

       colorUpdate(m_fileScoreColor, m_scoreColor) ||

       colorUpdate(m_fileGoalColor, m_goalColor) ||

-      valueUpdate(m_fileDelay, c_delayDescr, m_delay)) {

+      valueUpdate(m_fileDelay, c_delayDescr, m_delay) ||

+      valueUpdate(m_fileMaxScore, c_maxScoreDescr, m_maxScore)) {

     ret = true;

   }

@@ -232,6 +236,7 @@ void Pong::reinitialize()

   color2data(m_fileGoalColor, m_goalColor);

   // get values

   valueFromFile(m_fileDelay, c_delayDescr, m_delay);

+  valueFromFile(m_fileMaxScore, c_maxScoreDescr, m_maxScore);

   // reset scores

   m_scoreLeft = 0;

@@ -307,10 +312,19 @@ void Pong::timeCall()

     --m_goalDelay;

-    // new ball when delay is over

+    // delay is over

     if (m_goalDelay <= 0) {

+        // maximum score reached

+        if (m_scoreLeft >= (int)m_maxScore ||

+            m_scoreRight >= (int)m_maxScore) {

+          gameOver();

+          return; // no gameOver() calls deactivate(), no need to redraw

+        }

+        // game continues with new ball

+        else {

           startBall();

-        return; // startBall calls redraw() and planTimeCall()

+          return; // startBall() calls redraw() and planTimeCall()

+        }

     }

   }

@@ -608,5 +622,23 @@ void Pong::startBall()

   planTimeCall();

 }

+

+/// game over: close player connections and deactivate

+void Pong::gameOver()

+{

+  // close open operator connections

+  if (m_pConnLeft) {

+    m_pConnLeft->close();

+    m_pConnLeft = NULL;

+  }

+  if (m_pConnRight) {

+    m_pConnRight->close();

+    m_pConnRight = NULL;

+  }

+

+  // deactivate game

+  deactivate();

+}

+

 } // namespace Blinker

@@ -162,10 +162,15 @@ protected:

   /// start ball

   void startBall();

+  /// game over: close player connections and deactivate

+  void gameOver();

+

 protected:

   /// descriptor for delay value

   static ValueDescr const c_delayDescr;

+  /// descriptor for maximum score value

+  static ValueDescr const c_maxScoreDescr;

   /// operator connection name suffix for left player's connection

   static std::string const c_opConnSuffixLeft;

@@ -179,6 +184,7 @@ protected:

   ColorFile m_fileScoreColor;    ///< color file for score when ball is moving

   ColorFile m_fileGoalColor;     ///< color file for score during goal

   UIntFile  m_fileDelay;         ///< file for initial delay in ms per frame

+  UIntFile  m_fileMaxScore;      ///< file for maximum score (end of game)

   ColorData    m_ballColor;     ///< ball color

   ColorData    m_lineColor;     ///< center line color

@@ -187,6 +193,7 @@ protected:

   ColorData    m_scoreColor;    ///< score color when ball is moving

   ColorData    m_goalColor;     ///< score color during goal

   unsigned int m_delay;         ///< initial delay in ms per frame (ball speed)

+  unsigned int m_maxScore;      ///< maximum score (end of game)

   OpConn *m_pConnLeft;  ///< operator connection left player (or NULL)

   OpConn *m_pConnRight; ///< operator connection right player (or NULL)