Blinker

@@ -51,7 +51,7 @@ Tetris::Tetris(const std::string &name, Mgrs &mgrs, const Directory &dirBase):

   m_gameOverDelay(c_gameOverDelayDescr.default_),

   m_pConn(NULL),

   m_stone(-1), m_rot(-1), m_posX(-1), m_posY(-1),

-  m_dropping(false), m_blinking(0), m_completed(0), m_gameOver(0),

+  m_dropping(false), m_blinking(0), m_completed(0), m_gameOver(false),

   m_field(), m_rowsBlink()

 {

   // open operator connection interfaces for player

@@ -162,7 +162,7 @@ void Tetris::opConnRecvKey(OpConn *pConn, char key)

   /** normal keys for controlling game,

       deactivated if dropping stone, rows blinking or end of game */

-  if (m_dropping || m_blinking > 0 || m_gameOver > 0) {

+  if (m_dropping || m_blinking > 0 || m_gameOver) {

     return;

   }

@@ -277,7 +277,7 @@ void Tetris::reinitialize()

   // no rows blinking or completed, game not over yet

   m_blinking = 0;

   m_completed = 0;

-  m_gameOver = 0;

+  m_gameOver = false;

   // start with new stone

   newStone();

@@ -317,7 +317,7 @@ void Tetris::redraw()

 void Tetris::timeStep()

 {

   // count time at end of game

-  if (m_gameOver > 0) {

+  if (m_gameOver) {

     timeGameOver();

   // blinking of completed rows

   } else if (m_blinking > 0) {

@@ -334,11 +334,6 @@ void Tetris::timeStep()

 /// count time at end of game

 void Tetris::timeGameOver()

 {

-  // count time

-  ++m_gameOver;

-

-  // terminate game after some time

-  if (m_gameOver >= 8) {

   // close operator connection

   if (m_pConn) {

     forgetOpConn(m_pConn); // remove from requests (if it was in)

@@ -348,7 +344,6 @@ void Tetris::timeGameOver()

   // deactivate game

   deactivate();

 }

-}

 /// blink completed rows

 void Tetris::timeBlinkRows()

@@ -407,7 +402,7 @@ void Tetris::timeStone()

       // unset stone

       m_stone = -1;

       // game over

-      m_gameOver = 1;

+      m_gameOver = true;

       playOpConnSound(m_pConn, m_fileGameOverSound);

     }

@@ -481,7 +476,7 @@ void Tetris::planTimeStep()

   // compute interval based on game state

   int interval_ms = m_delay;

   int speedup = m_completed;

-  if (m_gameOver > 0) {

+  if (m_gameOver) {

     interval_ms = m_gameOverDelay;

     speedup = 0;

   } else if (m_blinking > 0) {

@@ -205,7 +205,7 @@ protected:

   bool m_dropping;  ///< whether currently dropping a stone

   int  m_blinking;  ///< step of blinking: 0 not blinking, lsb == 0 -> visible

   int  m_completed; ///< number of overall completed rows

-  int   m_gameOver;  ///< counter at end of game: 0 means game is running

+  bool m_gameOver;  ///< counter at end of game: 0 means game is running

   /// tetris field (y * m_width + x), -1 for free, >= 0 for pixel from stone

   std::vector<int> m_field;