Fixed paint mode erase

Author: CosminPerRam

include/cellMatrix.h

@@ -34,6 +34,7 @@ class cellMatrix
 	std::unique_ptr<std::vector<completetion>> checkCompletetion();
 	void executeCompletetions(std::unique_ptr<std::vector<completetion>>& completetions, cell withCell);
 
+	cell getCellState(const sf::Vector2u& tableCellCoords);
 	void applyBlock(Block& theBlock, const sf::Vector2u& tableCellCoords, cell cellType = cell::occupied);
 	bool canBlockBePlaced(Block& theBlock);
 

include/table.h

@@ -31,8 +31,6 @@ class Table
 
 	cellMatrix theMatrix;
 
-	sf::Vector2i mousePositionToCellPosition(const sf::Vector2f& mousePosition);
-
 	void calculateVertexes();
 
 public:
@@ -42,10 +40,11 @@ class Table
 
 	void updateColors();
 
-	void applyBlock(Block& theBlock, const sf::Vector2u& tableCellCoords);
+	cell getCellState(const sf::Vector2u& tableCellCoords);
+	void applyBlock(Block& theBlock, const sf::Vector2u& tableCellCoords, cell cellType = cell::occupied);
 	bool canBlockBePlaced(Block& theBlock);
-
 	sf::Vector2i previewBlock(Block& theHoldingBlock, const sf::Vector2f& mousePosition);
+	sf::Vector2i mousePositionToCellPosition(const sf::Vector2f& mousePosition);
 
 	const cellMatrix& getMatrix();
 	void reset();

src/cellMatrix.cpp

@@ -53,6 +53,10 @@ unsigned cellMatrix::getEmptyCellsAmount() const {
     return amount;
 }
 
+cell cellMatrix::getCellState(const sf::Vector2u& tableCellCoords) {
+    return cellTable[tableCellCoords.x][tableCellCoords.y];
+}
+
 sf::Vector2i cellMatrix::previewBlock(Block& theHoldingBlock, const sf::Vector2i& matrixPosition) {
     const auto& blockStructure = theHoldingBlock.getStructure();
     sf::Vector2i cellCoords = matrixPosition;
@@ -224,7 +228,7 @@ void cellMatrix::applyBlock(Block& theBlock, const sf::Vector2u& tableCellCoords
     for (unsigned x = 0; x < theBlock.getStructureSize().x; x++) {
         for (unsigned y = 0; y < theBlock.getStructureSize().y; y++) {
             if (structure[x][y] == 1)
-                cellTable[tableCellCoords.x + x][tableCellCoords.y + y] = cell::occupied;
+                cellTable[tableCellCoords.x + x][tableCellCoords.y + y] = cellType;
         }
     }
 }

src/pickupBoard.cpp

@@ -220,9 +220,6 @@ void PickupBoard::pollEvent(sf::RenderWindow& window, sf::Event& theEvent) {
         }
     }
     else {
-        if (Settings::Gameplay::paintMode)
-            paintModePreviewCoords = Game::theTable->previewBlock(paintModeBlock, mousePosition);
-
         if (theEvent.type == sf::Event::MouseButtonPressed && theEvent.mouseButton.button == sf::Mouse::Left) {
             for (unsigned i = 0; i < 3; i++) { //check for every 3 blocks from the pickup area
                 if (pickupableBlocks[i] == nullptr) //if they are picked up, if a block is nullptr, it means it was used
@@ -236,13 +233,28 @@ void PickupBoard::pollEvent(sf::RenderWindow& window, sf::Event& theEvent) {
                     pickupableBlocks[i]->setScale(PICKUP_SCALE);
                 }
             }
+        }
 
-            //if no pickupable blocks were picked up, process paintMode
-            if (pickedUpIndex == -1 && Settings::Gameplay::paintMode && (paintModePreviewCoords.x != -1 && paintModePreviewCoords.y != -1)) {
-                Game::theTable->applyBlock(paintModeBlock, { static_cast<unsigned>(paintModePreviewCoords.x), static_cast<unsigned>(paintModePreviewCoords.y) });
-                
-                if (isBoardLost())
-                    Game::theScore->setGameLost();
+        //if no pickupable blocks were picked up, process paintMode
+        if (Settings::Gameplay::paintMode && pickedUpIndex == -1) {
+            if (theEvent.type == sf::Event::MouseButtonPressed) {
+                if (theEvent.mouseButton.button == sf::Mouse::Left) {
+                    paintModePreviewCoords = Game::theTable->previewBlock(paintModeBlock, mousePosition);
+                    if (paintModePreviewCoords.x != -1 && paintModePreviewCoords.y != -1) {
+                        Game::theTable->applyBlock(paintModeBlock, { static_cast<unsigned>(paintModePreviewCoords.x), static_cast<unsigned>(paintModePreviewCoords.y) });
+
+                        if (isBoardLost())
+                            Game::theScore->setGameLost();
+                    }
+                }
+                else if (theEvent.mouseButton.button == sf::Mouse::Right) {
+                    paintModePreviewCoords = Game::theTable->mousePositionToCellPosition(mousePosition);
+                    if (paintModePreviewCoords.x != -1 && paintModePreviewCoords.y != -1) {
+                        sf::Vector2u unsignedPreviewCoords = { static_cast<unsigned>(paintModePreviewCoords.x), static_cast<unsigned>(paintModePreviewCoords.y) };
+                        if(Game::theTable->getCellState(unsignedPreviewCoords) == cell::occupied)
+                            Game::theTable->applyBlock(paintModeBlock, unsignedPreviewCoords, cell::empty);
+                    } 
+                }
             }
         }
     }

src/table.cpp

@@ -76,23 +76,31 @@ sf::Vector2i Table::mousePositionToCellPosition(const sf::Vector2f& mousePositio
     return { -1, -1 };
 }
 
-void Table::applyBlock(Block& theBlock, const sf::Vector2u& tableCellCoords) {
+cell Table::getCellState(const sf::Vector2u& tableCellCoords) {
+    return theMatrix.getCellState(tableCellCoords);
+}
+
+void Table::applyBlock(Block& theBlock, const sf::Vector2u& tableCellCoords, cell cellType) {
     //wont do any verifications for the tableCellCords or the block compatibility
     //because this function is SUPPOSED to be used ONLY with the RIGHT stuff.
 
-    Game::theScore->addPiecePlaced(theBlock.getStructureIndex());
-
-    theMatrix.applyBlock(theBlock, tableCellCoords);
+    theMatrix.applyBlock(theBlock, tableCellCoords, cellType);
 
-    auto completedMarks = theMatrix.checkCompletetion();
+    Game::theScore->addPiecePlaced(theBlock.getStructureIndex());
 
-    Game::theScore->processMarks(completedMarks);
-    if (completedMarks->empty())
+    if (cellType != cell::occupied)
         Audio::play(Audio::effect::GoodPlacement);
-    else
-        Audio::play(Audio::effect::Completetion);
+    else {
+        auto completedMarks = theMatrix.checkCompletetion();
+
+        Game::theScore->processMarks(completedMarks);
+        if (completedMarks->empty())
+            Audio::play(Audio::effect::GoodPlacement);
+        else
+            Audio::play(Audio::effect::Completetion);
 
-    theMatrix.executeCompletetions(completedMarks, cell::empty);
+        theMatrix.executeCompletetions(completedMarks, cell::empty);
+    }
 }
 
 sf::Vector2i Table::previewBlock(Block& theHoldingBlock, const sf::Vector2f& mousePosition) {