displaying kill

Author: dpinol

JewelBoard.cpp

@@ -47,7 +47,7 @@ void JewelBoard::createInitialJewelsBoard()
 
 void JewelBoard::kill(BoardPos pos)
 {
-
+  getJewel(pos).getModel().setColor(Jewel::NO_COLOR);
 }
 
 void JewelBoard::load(std::unique_ptr<LoaderParams> const &pParams)

JewelObject.cpp

@@ -46,6 +46,7 @@ void JewelObject::load(std::unique_ptr<LoaderParams> const &pParams)
 // draw the object to the screen
 void JewelObject::draw()
 {
+    if(getModel().getColor() != Jewel::NO_COLOR)
     TextureManager::Instance()->drawFrame(m_textureID, (Uint32)m_pixel.getX(), (Uint32)m_pixel.getY(),
                                           m_width, m_height, m_currentRow, getModel().getColor());
                                           //TheGame::Instance()->getRenderer(), m_angle, m_alpha);

model/Board.h

@@ -25,7 +25,6 @@ class Board : public BoardCallback
    */
   Board(BoardCallback &callback);
 
-
   template<class F>
   inline void forAllPos(F const &funct)
   {

model/JewelStrike.cpp

@@ -8,12 +8,13 @@
 #include "JewelStrike.h"
 #include "Jewel.h"
 
-JewelStrike::JewelStrike(Board &board)
-  :m_board(board)
+JewelStrike::JewelStrike(Board &board, BoardCallback * callback)
+  :m_board(board), m_callback(callback)
 {
 }
 
 
+
 bool JewelStrike::findMatch(BoardPos newPos, Jewel::COLOR newColor, BoardPos ignorePos) const
 {
   bool match = false;
@@ -47,10 +48,13 @@ bool JewelStrike::findMatch(BoardPos newPos, Jewel::COLOR newColor, BoardPos ign
     }
     if (len[0] + len[1] >= MIN_LEN)
     {
-      for (short l = -len[1]; l < len[0]; l++)
+      if (m_callback)
       {
-        m_board.kill(cur);
-        cur += directions[d];
+        for (short l = -len[1]; l < len[0]; l++)
+        {
+          m_callback->kill(cur);
+          cur += directions[d];
+        }
       }
       match = true;
     }

model/JewelStrike.h

@@ -23,9 +23,15 @@ class JewelStrike
    */
   constexpr static short MIN_LEN = 3;
 
-  JewelStrike(Board &board);
   /**
-   * @brief findMatch
+   * @brief JewelStrike
+   * @param board
+   * @param callback
+   */
+  JewelStrike(Board &board, BoardCallback * callback = NULL);
+
+  /**
+   * @brief findMatch if callback, its kill() will be called for detected strikes
    * @param newPos
    * @param newColor
    * @param ignorePos in case of a swap, don't check the position color, as for sure it does
@@ -35,7 +41,8 @@ class JewelStrike
   bool findMatch(BoardPos newPos, Jewel::COLOR newColor, BoardPos ignorePos = BoardPos()) const;
 
 private:
-  Board &m_board;
+  Board& m_board;
+  BoardCallback* m_callback;
 };
 
 #endif // JEWELSTRIKE_H

model/JewelSwap.cpp

@@ -38,10 +38,13 @@ bool JewelSwap::isValid() const
 {
   if (m_validated)
     return m_valid;
-  JewelStrike strike(m_board);
-  m_valid = strike.findMatch(m_positions[0], m_board.getJewel(m_positions[1]).getColor(), m_positions[1]);
-  //order important to avoid shortcut (maybe 2 parallel strikes are formed)
-  m_valid = strike.findMatch(m_positions[1], m_board.getJewel(m_positions[0]).getColor(), m_positions[0]) || m_valid;
+  JewelStrike strike(m_board, &m_board);
+  m_valid = false;
+  for (int i = 0; i < 2; i++)
+  {
+    if (strike.findMatch(m_positions[i], m_board.getJewel(m_positions[1 - i]).getColor(), m_positions[1 - i]))
+        m_valid = true;
+  }
   m_validated = true;
   if (!m_valid)
     LOG_DEBUG("Swap " << m_positions[0] << "-" << m_positions[1] <<" not valid because it would not form a strike");