looks perfect. falling directly in strike were before not detected

Author: dpinol

GameObject.h

@@ -30,7 +30,7 @@ class GameObject
     virtual ~GameObject();
 
     // load from file - int x, int y, int width, int height, std::string textureID, int numFrames, int callbackID = 0, int animSpeed = 0
-    virtual void load(std::unique_ptr<LoaderParams> const &pParams) {}
+    virtual void load(std::unique_ptr<LoaderParams> const &) {}
 
     // draw the object
     virtual void draw() = 0;

JewelBoard.cpp

@@ -200,6 +200,7 @@ void JewelBoard::update()
   m_model.update();
   m_jewelsFalling = false;
   bool boardChanged = false;
+  int totalStrikesLen = 0;
   forAllPos([&](BoardPos pos)
   {
     JewelObject &jo = getJewel(pos);
@@ -211,7 +212,7 @@ void JewelBoard::update()
     if (pos.m_row > 0 && !jo.isDying() && (jo.isFalling() || jo.isDead()))
     {
       m_jewelsFalling = true;
-      BoardPos const upperPos = BoardPos(pos.m_col, pos.m_row - 1);
+      BoardPos const upperPos = pos.getAbove();
       JewelObject &upper = getJewel(upperPos);
       if (!upper.isFalling())
       {
@@ -224,23 +225,34 @@ void JewelBoard::update()
           upper.getPixel() = getJewelPixel(upperPos);
         }
       }
-
     }
     jo.update();
   });
 
   bool scored = false;
-  if (boardChanged)
+  //@todo call findMatch on falling jewels which are isStable
+  //(and all jewels in strike also isStable). And then m_jewelsFalling can be removed
+  if (/*boardChanged &&*/ !m_jewelsFalling)
   {    
     forAllPos([&](BoardPos pos)
     {
       JewelObject &jo = getJewel(pos);
       if (!jo.isFalling())
-        scored = m_strike.findMatch(pos, getJewel(pos).getModel().getColor()) || scored;
+      {
+        int strikesLen;
+        strikesLen = m_strike.findMatch(pos, getJewel(pos).getModel().getColor());
+        totalStrikesLen += strikesLen;
+        scoreAt(pos, strikesLen);
+      }
     }, false);
+    if (!m_jewelsFalling && totalStrikesLen == 0)
+      TheGame::Instance()->getMatch().nextTurn();
   }
-  if (!scored && !m_jewelsFalling)
-    TheGame::Instance()->getMatch().nextTurn();
+}
+
+void JewelBoard::scoreAt(BoardPos pos, int numJewels)
+{
+
 }
 
 void JewelBoard::clean()

JewelBoard.h

@@ -86,6 +86,13 @@ class JewelBoard : public GameObject, public BoardCallback
     Board const &getModel() const;
 
 private:
+    /**
+     * @brief scoreAt manages the scoring
+     * @param pos
+     * @param score
+     */
+    void scoreAt(BoardPos pos, int numJewels);
+
     /**
      * Just swap the 2 pointers to the Jewels
      */

JewelObject.cpp

@@ -132,6 +132,7 @@ void JewelObject::resurrect()
 {
   m_bDying = false;
   m_bDead = false;
+  //@todo we should allow direct strike. fo
   getModel().setColor(random() % Jewel::NUM_COLORS);
 }
 

model/Board.cpp

@@ -56,7 +56,7 @@ void Board::randomize()
     do
     {
       jewel.setColor(random() % Jewel::NUM_COLORS);
-    } while (strike.findMatch(pos, jewel.getColor()));
+    } while (strike.findMatch(pos, jewel.getColor()) > 0);
   }, true);
 }
 #ifdef NDEBUG

model/JewelSwap.cpp

@@ -42,7 +42,7 @@ bool JewelSwap::isValid() const
   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]))
+    if (strike.findMatch(m_positions[i], m_board.getJewel(m_positions[1 - i]).getColor(), m_positions[1 - i]) > 0)
         m_valid = true;
   }
   m_validated = true;