Blinker

@@ -0,0 +1 @@

+50

@@ -39,13 +39,16 @@ Tetris::Tetris(const std::string &name, Mgrs &mgrs, const Directory &dirBase):

   m_fileStoneColor(dirBase.getFile("stoneColor")),

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

   m_fileDropDelay(dirBase.getFile("dropDelay")),

+  m_fileBlinkDelay(dirBase.getFile("blinkDelay")),

   m_fileStartSound(dirBase.getFile("startSound")),

   m_stoneColor(),

   m_delay(c_delayDescr.default_),

   m_dropDelay(c_dropDelayDescr.default_),

+  m_blinkDelay(c_blinkDelayDescr.default_),

   m_pConn(NULL),

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

-  m_field()

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

+  m_dropping(false), m_blinking(0),

+  m_field(), m_rowsBlink()

 {

   // open operator connection interfaces for player

   m_mgrs.m_opMgr.open(m_name, this);

@@ -73,7 +76,8 @@ bool Tetris::updateConfigGame()

   // cfg value file was updated -> read new cfg value, return true for update

   if (colorUpdate(m_fileStoneColor, m_stoneColor) ||

       valueUpdate(m_fileDelay, c_delayDescr, m_delay) ||

-      valueUpdate(m_fileDropDelay, c_dropDelayDescr, m_dropDelay)) {

+      valueUpdate(m_fileDropDelay, c_dropDelayDescr, m_dropDelay) ||

+      valueUpdate(m_fileBlinkDelay, c_blinkDelayDescr, m_blinkDelay)) {

     ret = true;

   }

@@ -331,7 +335,12 @@ void Tetris::planTimeStep()

   }

   // compute interval based on game state

-  int interval_ms = m_dropping ? m_dropDelay : m_delay;

+  int interval_ms = m_delay;

+  if (m_dropping) {

+    interval_ms = m_dropDelay;

+  } else if (m_blinking > 0) {

+    interval_ms = m_blinkDelay;

+  }

   float interval = 1e-3f * interval_ms;

   // request next time call

@@ -496,5 +505,8 @@ Tetris::ValueDescr const Tetris::c_delayDescr = { 400, 200, 1000 };

 /// descriptor for delay value during dropping a stone

 Tetris::ValueDescr const Tetris::c_dropDelayDescr = { 100, 50, 250 };

+/// descriptor for delay value during blinking of disappearing rows

+Tetris::ValueDescr const Tetris::c_blinkDelayDescr = { 50, 50, 250 };

+

 } // namespace Blinker

@@ -159,15 +159,20 @@ protected:

   /// descriptor for delay value during dropping a stone

   static ValueDescr const c_dropDelayDescr;

+  /// descriptor for delay value during blinking of disappearing rows

+  static ValueDescr const c_blinkDelayDescr;

+

   ColorFile m_fileStoneColor; ///< color file for stone color

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

   UIntFile  m_fileDropDelay;  ///< file for delay while dropping (ms / frame)

+  UIntFile  m_fileBlinkDelay; ///< file for delay while blinking (ms / frame)

   NameFile m_fileStartSound; ///< "start game" sound name file

   ColorData    m_stoneColor; ///< stone color

   unsigned int m_delay;      ///< initial delay in ms per frame

   unsigned int m_dropDelay;  ///< delay while dropping in ms per frame

+  unsigned int m_blinkDelay; ///< delay while rwos blinking in ms per frame

   OpConn *m_pConn; ///< operator connection of player (or NULL)

@@ -176,9 +181,12 @@ protected:

   int   m_posX;     ///< x position of current stone

   int   m_posY;     ///< y position of current stone

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

+  int   m_blinking; ///< step of blinking: 0 not blinking

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

   std::vector<int> m_field;

+  /// sorted y indices of rows that are currently blinking

+  std::vector<int> m_rowsBlink;

 }; // class Tetris

 } // namespace Blinker