Blinker

@@ -38,11 +38,14 @@ Tetris::Tetris(const std::string &name, Mgrs &mgrs, const Directory &dirBase):

   Game(name, mgrs, dirBase),

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

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

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

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

   m_stoneColor(),

   m_delay(c_delayDescr.default_),

+  m_dropDelay(c_dropDelayDescr.default_),

   m_pConn(NULL),

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

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

+  m_field()

 {

   // open operator connection interfaces for player

   m_mgrs.m_opMgr.open(m_name, this);

@@ -69,7 +72,8 @@ bool Tetris::updateConfigGame()

   // color file was modified -> convert color, return true for update

   // 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_fileDelay, c_delayDescr, m_delay) ||

+      valueUpdate(m_fileDropDelay, c_dropDelayDescr, m_dropDelay)) {

     ret = true;

   }

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

     return;

   }

-  // normal keys for controlling game

+  /** normal keys for controlling game,

+      deactivated if dropping stone */

+  if (m_dropping) {

+    return;

+  }

   // move left

   if (key == '4') {

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

   // drop stone

   if (key == '8') {

-    // TODO

+    m_dropping = true;

+    planTimeStep(); // stone falls fater now -> update time callback

     return;

   }

 }

@@ -307,6 +316,9 @@ void Tetris::newStone()

   // postion: two pixels above top middle

   m_posX = (m_width - 1) / 2;

   m_posY = -2;

+

+  // stone is not being dropped yet

+  m_dropping = false;

 }

 /// set time for next time step of game - or unset if not needed

@@ -318,8 +330,9 @@ void Tetris::planTimeStep()

     return;

   }

-  // compute interval based on score and bounce count

-  float interval = 1e-3f * m_delay;

+  // compute interval based on game state

+  int interval_ms = m_dropping ? m_dropDelay : m_delay;

+  float interval = 1e-3f * interval_ms;

   // request next time call

   Time stepTime;

@@ -480,5 +493,8 @@ int const Tetris::c_pixelCnt = sizeof(Tetris::RotStone::pixels) /

 /// descriptor for delay value

 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 };

+

 } // namespace Blinker

@@ -156,13 +156,18 @@ protected:

   /// descriptor for delay value

   static ValueDescr const c_delayDescr;

+  /// descriptor for delay value during dropping a stone

+  static ValueDescr const c_dropDelayDescr;

+

   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)

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

   ColorData    m_stoneColor; ///< stone color

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

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

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

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

@@ -170,6 +175,7 @@ protected:

   int   m_rot;      ///< rotation of current stone

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

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

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

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

   std::vector<int> m_field;