Blinker

@@ -62,27 +62,48 @@

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

             <td></td>

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

+        <tr><td><code>fixedIColor</code></td>

+            <td></td>

+            <td>fixed stones of type "I"</td></tr>

+        <tr><td><code>fixedJColor</code></td>

+            <td></td>

+            <td>fixed stones of type "J"</td></tr>

+        <tr><td><code>fixedLColor</code></td>

+            <td></td>

+            <td>fixed stones of type "L"</td></tr>

+        <tr><td><code>fixedOColor</code></td>

+            <td></td>

+            <td>fixed stones of type "O"</td></tr>

+        <tr><td><code>fixedSColor</code></td>

+            <td></td>

+            <td>fixed stones of type "S"</td></tr>

+        <tr><td><code>fixedTColor</code></td>

+            <td></td>

+            <td>fixed stones of type "T"</td></tr>

+        <tr><td><code>fixedZColor</code></td>

+            <td></td>

+            <td>fixed stones of type "Z"</td></tr>

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

             <td></td>

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

+            <td>active stones of type "I"</td></tr>

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

             <td></td>

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

+            <td>active stones of type "J"</td></tr>

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

             <td></td>

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

+            <td>active stones of type "L"</td></tr>

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

             <td></td>

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

+            <td>active stones of type "O"</td></tr>

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

             <td></td>

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

+            <td>active stones of type "S"</td></tr>

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

             <td></td>

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

+            <td>active stones of type "T"</td></tr>

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

             <td></td>

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

+            <td>active stones of type "Z"</td></tr>

       </table>

     </p>

     <h3>Delays</h3>

@@ -0,0 +1 @@

+C00000

@@ -0,0 +1 @@

+C0C000

@@ -0,0 +1 @@

+C000C0

@@ -0,0 +1 @@

+2020C0

@@ -0,0 +1 @@

+00C0C0

@@ -0,0 +1 @@

+00C000

@@ -0,0 +1 @@

+C06000

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

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

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

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

+  m_fileFixedIColor(dirBase.getFile("fixedIColor")),

+  m_fileFixedLColor(dirBase.getFile("fixedLColor")),

+  m_fileFixedJColor(dirBase.getFile("fixedJColor")),

+  m_fileFixedTColor(dirBase.getFile("fixedTColor")),

+  m_fileFixedOColor(dirBase.getFile("fixedOColor")),

+  m_fileFixedZColor(dirBase.getFile("fixedZColor")),

+  m_fileFixedSColor(dirBase.getFile("fixedSColor")),

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

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

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

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

   (void)doReinit;

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

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

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

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

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

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

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

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

+  if (colorUpdate(m_fileStoneIColor, 255, m_stoneColors[Active][StoneI])) {

+    doRedraw = true;

+  }

+  if (colorUpdate(m_fileStoneLColor, 255, m_stoneColors[Active][StoneL])) {

+    doRedraw = true;

+  }

+  if (colorUpdate(m_fileStoneJColor, 255, m_stoneColors[Active][StoneJ])) {

+    doRedraw = true;

+  }

+  if (colorUpdate(m_fileStoneTColor, 255, m_stoneColors[Active][StoneT])) {

+    doRedraw = true;

+  }

+  if (colorUpdate(m_fileStoneOColor, 255, m_stoneColors[Active][StoneO])) {

+    doRedraw = true;

+  }

+  if (colorUpdate(m_fileStoneZColor, 255, m_stoneColors[Active][StoneZ])) {

+    doRedraw = true;

+  }

+  if (colorUpdate(m_fileStoneSColor, 255, m_stoneColors[Active][StoneS])) {

+    doRedraw = true;

+  }

+  if (colorUpdate(m_fileFixedIColor, 192, m_stoneColors[Fixed][StoneI])) {

+    doRedraw = true;

+  }

+  if (colorUpdate(m_fileFixedLColor, 192, m_stoneColors[Fixed][StoneL])) {

+    doRedraw = true;

+  }

+  if (colorUpdate(m_fileFixedJColor, 192, m_stoneColors[Fixed][StoneJ])) {

+    doRedraw = true;

+  }

+  if (colorUpdate(m_fileFixedTColor, 192, m_stoneColors[Fixed][StoneT])) {

+    doRedraw = true;

+  }

+  if (colorUpdate(m_fileFixedOColor, 192, m_stoneColors[Fixed][StoneO])) {

+    doRedraw = true;

+  }

+  if (colorUpdate(m_fileFixedZColor, 192, m_stoneColors[Fixed][StoneZ])) {

+    doRedraw = true;

+  }

+  if (colorUpdate(m_fileFixedSColor, 192, m_stoneColors[Fixed][StoneS])) {

+    doRedraw = true;

+  }

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

   valueUpdate(m_fileDelay, c_delayDescr, m_delay);

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

     if (checkStoneFit(m_stone, m_rot, m_posY, m_posX - 1)) {

       wipeStone(m_stone, m_rot, m_posY, m_posX);

       m_posX -= 1;

-      drawStone(m_stone, m_rot, m_posY, m_posX); // TODO: active color

+      drawStone(m_stone, m_rot, m_posY, m_posX, Active);

       sendFrame();

     }

     return;

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

     if (checkStoneFit(m_stone, m_rot, m_posY, m_posX + 1)) {

       wipeStone(m_stone, m_rot, m_posY, m_posX);

       m_posX += 1;

-      drawStone(m_stone, m_rot, m_posY, m_posX); // TODO: active color

+      drawStone(m_stone, m_rot, m_posY, m_posX, Active);

       sendFrame();

     }

     return;

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

     if (checkStoneFit(m_stone, new_rot, m_posY, m_posX)) {

       wipeStone(m_stone, m_rot, m_posY, m_posX);

       m_rot = new_rot;

-      drawStone(m_stone, m_rot, m_posY, m_posX); // TODO: active color

+      drawStone(m_stone, m_rot, m_posY, m_posX, Active);

       sendFrame();

     }

     return;

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

     if (checkStoneFit(m_stone, new_rot, m_posY, m_posX)) {

       wipeStone(m_stone, m_rot, m_posY, m_posX);

       m_rot = new_rot;

-      drawStone(m_stone, m_rot, m_posY, m_posX); // TODO: active color

+      drawStone(m_stone, m_rot, m_posY, m_posX, Active);

       sendFrame();

     }

     return;

@@ -265,13 +307,20 @@ void Tetris::opConnClose(OpConn *pConn)

 void Tetris::reinitialize()

 {

   // convert colors

-  color2data(m_fileStoneIColor, 255, m_stoneColors[StoneI]);

-  color2data(m_fileStoneLColor, 255, m_stoneColors[StoneL]);

-  color2data(m_fileStoneJColor, 255, m_stoneColors[StoneJ]);

-  color2data(m_fileStoneTColor, 255, m_stoneColors[StoneT]);

-  color2data(m_fileStoneOColor, 255, m_stoneColors[StoneO]);

-  color2data(m_fileStoneZColor, 255, m_stoneColors[StoneZ]);

-  color2data(m_fileStoneSColor, 255, m_stoneColors[StoneS]);

+  color2data(m_fileStoneIColor, 255, m_stoneColors[Active][StoneI]);

+  color2data(m_fileStoneLColor, 255, m_stoneColors[Active][StoneL]);

+  color2data(m_fileStoneJColor, 255, m_stoneColors[Active][StoneJ]);

+  color2data(m_fileStoneTColor, 255, m_stoneColors[Active][StoneT]);

+  color2data(m_fileStoneOColor, 255, m_stoneColors[Active][StoneO]);

+  color2data(m_fileStoneZColor, 255, m_stoneColors[Active][StoneZ]);

+  color2data(m_fileStoneSColor, 255, m_stoneColors[Active][StoneS]);

+  color2data(m_fileFixedIColor, 255, m_stoneColors[Fixed][StoneI]);

+  color2data(m_fileFixedLColor, 255, m_stoneColors[Fixed][StoneL]);

+  color2data(m_fileFixedJColor, 255, m_stoneColors[Fixed][StoneJ]);

+  color2data(m_fileFixedTColor, 255, m_stoneColors[Fixed][StoneT]);

+  color2data(m_fileFixedOColor, 255, m_stoneColors[Fixed][StoneO]);

+  color2data(m_fileFixedZColor, 255, m_stoneColors[Fixed][StoneZ]);

+  color2data(m_fileFixedSColor, 255, m_stoneColors[Fixed][StoneS]);

   // get values

   valueFromFile(m_fileDelay, c_delayDescr, m_delay);

@@ -313,14 +362,14 @@ 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_stoneColors[m_field.at(i)]);

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

         }

       }

     }

   }

   // draw current stone

-  drawStone(m_stone, m_rot, m_posY, m_posX);

+  drawStone(m_stone, m_rot, m_posY, m_posX, Active);

   // send updated image buffer as frame

   sendFrame();

@@ -401,14 +450,14 @@ void Tetris::timeStone()

     // move stone down by one pixel

     wipeStone(m_stone, m_rot, m_posY, m_posX);

     m_posY += 1;

-    drawStone(m_stone, m_rot, m_posY, m_posX); // TODO: active color

+    drawStone(m_stone, m_rot, m_posY, m_posX, Active);

   }

   // stone cannot move down by one pixel

   else {

     // add stone permanently to field at current position

     freezeStone(m_stone, m_rot, m_posY, m_posX);

-    drawStone(m_stone, m_rot, m_posY, m_posX); // TODO: frozen color

+    drawStone(m_stone, m_rot, m_posY, m_posX, Fixed);

     // overflow of game field -> game over

     if (checkStoneOverflow(m_stone, m_rot, m_posY, m_posX)) {

@@ -589,9 +638,9 @@ 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)

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

 {

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

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

 }

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

@@ -43,7 +43,14 @@ protected:

     StoneO,

     StoneZ,

     StoneS,

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

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

+  };

+

+  /// stone state

+  enum State {

+    Active, ///< stone is falling

+    Fixed, ///< stone is fixed part of field

+    StateCnt ///< not an index, but number of stone states

   };

   /// coordinates of a pixel part of a stone

@@ -168,7 +175,7 @@ protected:

   void freezeStone(int stone, int rot, int y, int x);

   /// draw a stone to image buffer

-  void drawStone(int stone, int rot, int y, int x);

+  void drawStone(int stone, int rot, int y, int x, State state);

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

   void wipeStone(int stone, int rot, int y, int x);

@@ -196,13 +203,20 @@ protected:

   /// descriptor for delay value at end of game

   static ValueDescr const c_gameOverDelayDescr;

-  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

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

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

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

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

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

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

+  ColorFile m_fileStoneSColor;   ///< color file for active S stone color

+  ColorFile m_fileFixedIColor;   ///< color file for fixed I stone color

+  ColorFile m_fileFixedLColor;   ///< color file for fixed L stone color

+  ColorFile m_fileFixedJColor;   ///< color file for fixed J stone color

+  ColorFile m_fileFixedTColor;   ///< color file for fixed T stone color

+  ColorFile m_fileFixedOColor;   ///< color file for fixed O stone color

+  ColorFile m_fileFixedZColor;   ///< color file for fixed Z stone color

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

@@ -212,7 +226,7 @@ protected:

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

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

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

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

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

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