Blinker

@@ -62,9 +62,27 @@

         <tr><td><code>backgroundColor</code></td>

             <td></td>

             <td>background of the tetris field</td></tr>

-        <tr><td><code>stoneColor</code></td>

+        <tr><td><code>stoneIColor</code></td>

             <td></td>

-            <td>stones - falling stone as well as fixed stones</td></tr>

+            <td>stones of type "I" (falling and fixed)</td></tr>

+        <tr><td><code>stoneJColor</code></td>

+            <td></td>

+            <td>stones of type "J" (falling and fixed)</td></tr>

+        <tr><td><code>stoneLColor</code></td>

+            <td></td>

+            <td>stones of type "L" (falling and fixed)</td></tr>

+        <tr><td><code>stoneOColor</code></td>

+            <td></td>

+            <td>stones of type "O" (falling and fixed)</td></tr>

+        <tr><td><code>stoneSColor</code></td>

+            <td></td>

+            <td>stones of type "S" (falling and fixed)</td></tr>

+        <tr><td><code>stoneTColor</code></td>

+            <td></td>

+            <td>stones of type "T" (falling and fixed)</td></tr>

+        <tr><td><code>stoneZColor</code></td>

+            <td></td>

+            <td>stones of type "Z" (falling and fixed)</td></tr>

       </table>

     </p>

     <h3>Delays</h3>

@@ -1 +0,0 @@

-FFFFFF

@@ -0,0 +1 @@

+FF0000

@@ -0,0 +1 @@

+FFFF00

@@ -0,0 +1 @@

+FF00FF

@@ -0,0 +1 @@

+0000FF

@@ -0,0 +1 @@

+00FFFF

@@ -0,0 +1 @@

+00FF00

@@ -0,0 +1 @@

+FF8000

@@ -36,7 +36,13 @@ namespace Blinker {

  */

 Tetris::Tetris(const std::string &name, Mgrs &mgrs, const Directory &dirBase):

   Game(name, mgrs, dirBase),

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

+  m_fileStoneIColor(dirBase.getFile("stoneIColor")),

+  m_fileStoneLColor(dirBase.getFile("stoneLColor")),

+  m_fileStoneJColor(dirBase.getFile("stoneJColor")),

+  m_fileStoneTColor(dirBase.getFile("stoneTColor")),

+  m_fileStoneOColor(dirBase.getFile("stoneOColor")),

+  m_fileStoneZColor(dirBase.getFile("stoneZColor")),

+  m_fileStoneSColor(dirBase.getFile("stoneSColor")),

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

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

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

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

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

   m_fileRowCompleteSound(dirBase.getFile("rowCompleteSound")),

   m_fileGameOverSound(dirBase.getFile("gameOverSound")),

-  m_stoneColor(),

   m_delay(c_delayDescr.default_),

   m_dropDelay(c_dropDelayDescr.default_),

   m_blinkDelay(c_blinkDelayDescr.default_),

@@ -81,7 +86,13 @@ void Tetris::updateConfigGame(bool &doReinit, bool &doRedraw)

   (void)doReinit;

   // color file was modified -> convert color, ask for redraw

-  if (colorUpdate(m_fileStoneColor, m_stoneColor)) { doRedraw = true; }

+  if (colorUpdate(m_fileStoneIColor, m_stoneColors[StoneI])) { doRedraw = true; }

+  if (colorUpdate(m_fileStoneLColor, m_stoneColors[StoneL])) { doRedraw = true; }

+  if (colorUpdate(m_fileStoneJColor, m_stoneColors[StoneJ])) { doRedraw = true; }

+  if (colorUpdate(m_fileStoneTColor, m_stoneColors[StoneT])) { doRedraw = true; }

+  if (colorUpdate(m_fileStoneOColor, m_stoneColors[StoneO])) { doRedraw = true; }

+  if (colorUpdate(m_fileStoneZColor, m_stoneColors[StoneZ])) { doRedraw = true; }

+  if (colorUpdate(m_fileStoneSColor, m_stoneColors[StoneS])) { doRedraw = true; }

   // delay cfg value file was updated -> read new delay cfg value, no re-*

   valueUpdate(m_fileDelay, c_delayDescr, m_delay);

@@ -254,7 +265,14 @@ void Tetris::opConnClose(OpConn *pConn)

 void Tetris::reinitialize()

 {

   // convert colors

-  color2data(m_fileStoneColor, m_stoneColor);

+  color2data(m_fileStoneIColor, m_stoneColors[StoneI]);

+  color2data(m_fileStoneLColor, m_stoneColors[StoneL]);

+  color2data(m_fileStoneJColor, m_stoneColors[StoneJ]);

+  color2data(m_fileStoneTColor, m_stoneColors[StoneT]);

+  color2data(m_fileStoneOColor, m_stoneColors[StoneO]);

+  color2data(m_fileStoneZColor, m_stoneColors[StoneZ]);

+  color2data(m_fileStoneSColor, m_stoneColors[StoneS]);

+

   // get values

   valueFromFile(m_fileDelay, c_delayDescr, m_delay);

   valueFromFile(m_fileDropDelay, c_dropDelayDescr, m_dropDelay);

@@ -295,7 +313,7 @@ void Tetris::redraw()

     if (! (m_blinking & 1) || ! m_rowsBlink.at(y)) {

       for (int x = 0; x < m_width; ++x, ++i) {

         if (m_field.at(i) >= 0) {

-          pixel(y, x, m_stoneColor);

+          pixel(y, x, m_stoneColors[m_field.at(i)]);

         }

       }

     }

@@ -573,7 +591,7 @@ void Tetris::freezeStone(int stone, int rot, int y, int x)

 /// draw a stone to image buffer

 void Tetris::drawStone(int stone, int rot, int y, int x)

 {

-  colorStone(stone, rot, y, x, m_stoneColor);

+  colorStone(stone, rot, y, x, m_stoneColors[stone]);

 }

 /// wipe a stone from image buffer (i.e. replace it with background color)

@@ -598,8 +616,8 @@ void Tetris::colorStone(int stone, int rot, int y, int x,

   }

 }

-/// stone data

-Tetris::Stone const Tetris::c_stones[7] = {

+/// stone data (make sure it matches the StoneIndex enum)

+Tetris::Stone const Tetris::c_stones[Tetris::StoneCnt] = {

   // the I

   { {

       { { { -2,  0 }, { -1,  0 }, {  0,  0 }, {  1,  0 } } },

@@ -34,6 +34,18 @@ namespace Blinker {

 class Tetris: public Game, public OpReqIf

 {

 protected:

+  /// indices of the stones

+  enum StoneIndex {

+    StoneI,

+    StoneL,

+    StoneJ,

+    StoneT,

+    StoneO,

+    StoneZ,

+    StoneS,

+    StoneCnt // not an index, but number of stones

+  };

+

   /// coordinates of a pixel part of a stone

   struct Coord {

     int x;

@@ -165,8 +177,8 @@ protected:

   void colorStone(int stone, int rot, int y, int x, ColorData const &color);

 protected:

-  /// stone data

-  static Stone const c_stones[7];

+  /// stone data (make sure it matches the StoneIndex enum)

+  static Stone const c_stones[StoneCnt];

   static int const c_stoneCnt; ///< number of stones

   static int const c_rotCnt;   ///< number of rotations per stone

@@ -184,7 +196,13 @@ protected:

   /// descriptor for delay value at end of game

   static ValueDescr const c_gameOverDelayDescr;

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

+  ColorFile m_fileStoneIColor;   ///< color file for I stone color

+  ColorFile m_fileStoneLColor;   ///< color file for L stone color

+  ColorFile m_fileStoneJColor;   ///< color file for J stone color

+  ColorFile m_fileStoneTColor;   ///< color file for T stone color

+  ColorFile m_fileStoneOColor;   ///< color file for O stone color

+  ColorFile m_fileStoneZColor;   ///< color file for Z stone color

+  ColorFile m_fileStoneSColor;   ///< color file for S 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)

@@ -194,7 +212,8 @@ protected:

   NameFile m_fileRowCompleteSound; ///< "row complete" sound name file

   NameFile m_fileGameOverSound;    ///< "game over" sound name file

-  ColorData    m_stoneColor;    ///< stone color

+  ColorData m_stoneColors[StoneCnt]; ///< stone colors

+

   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 rows blinking in ms per frame