Implemented click to move

hold to move is still the default option tho

Author: CosminPerRam

include/settings.h

@@ -53,6 +53,8 @@ namespace Settings
 		inline static unsigned customBlockSizeHeight, customBlockSizeWidth;
 		inline static bool customBlockStructure[5][5];
 
+		inline static bool holdToMove;
+
 		static void defaultValues();
 		static void save(std::stringstream& sstream);
 		static void load(std::stringstream& sstream);

src/imguiInterface.cpp

@@ -132,6 +132,9 @@ void ImguiInterface::draw(sf::RenderWindow& window) {
 
 			if (ImGui::TreeNode("Pickup board"))
 			{
+				ImGui::Checkbox("Hold to move block.", &Settings::Gameplay::holdToMove);
+				ImGui::Separator();
+
 				ImGui::Text("Type:");
 				ImGui::SameLine();
 				if (ImGui::Button("Random")) {

src/pickupBoard.cpp

@@ -197,7 +197,7 @@ void PickupBoard::pollEvent(sf::RenderWindow& window, sf::Event& theEvent) {
         pickupableBlocks[pickedUpIndex]->setPosition(mousePositionWithOffset);
         pickedUpPreviewCoords = Game::theTable->previewBlock(*pickupableBlocks[pickedUpIndex], mousePosition);
 
-        if (theEvent.type == sf::Event::MouseButtonReleased && theEvent.mouseButton.button == sf::Mouse::Left) {
+        if (theEvent.type == (Settings::Gameplay::holdToMove ? sf::Event::MouseButtonReleased : sf::Event::MouseButtonPressed)) {
             pickupableBlocks[pickedUpIndex]->setFloating(false);
 
             if (pickedUpPreviewCoords.x != -1 || pickedUpPreviewCoords.y != -1) {
@@ -217,10 +217,20 @@ void PickupBoard::pollEvent(sf::RenderWindow& window, sf::Event& theEvent) {
             }
 
             pickedUpIndex = -1;
+
+            return;
         }
     }
     else {
-        if (theEvent.type == sf::Event::MouseButtonPressed && theEvent.mouseButton.button == sf::Mouse::Left) {
+        if(Settings::Gameplay::paintMode)
+            paintModePreviewCoords = Game::theTable->previewBlock(paintModeBlock, mousePosition);
+    }
+
+    if (theEvent.type != sf::Event::MouseButtonPressed)
+        return;
+
+    if (theEvent.mouseButton.button == sf::Mouse::Left) {
+        if (pickedUpIndex == -1) {
             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
                     continue;
@@ -233,31 +243,26 @@ void PickupBoard::pollEvent(sf::RenderWindow& window, sf::Event& theEvent) {
                     pickupableBlocks[i]->setScale(PICKUP_SCALE);
                 }
             }
-        }
 
-        //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);
-                    } 
+            //if no pickupable blocks were picked up, process paintMode
+            if (Settings::Gameplay::paintMode) {
+                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 && pickedUpIndex == -1) {
+        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);
+        }
+    }
 }
 
 void PickupBoard::update(sf::RenderWindow& window, sf::Time& dt) {

src/settings.cpp

@@ -112,11 +112,13 @@ namespace Settings
 				customBlockStructure[i][j] = 0;
 		}
 
+		holdToMove = true;
+
 		Gameplay::apply();
 	}
 
 	void Gameplay::save(std::stringstream& sstream) {
-		sstream << checkGameInAdvance << " " << continousGenerate << " " << blockModel << " ";
+		sstream << holdToMove << " " << checkGameInAdvance << " " << continousGenerate << " " << blockModel << " ";
 		sstream << customBlockSizeHeight << " " << customBlockSizeWidth << " ";
 		for (unsigned i = 0; i < 5; i++) {
 			for (unsigned j = 0; j < 5; j++)
@@ -126,7 +128,7 @@ namespace Settings
 	}
 
 	void Gameplay::load(std::stringstream& sstream) {
-		sstream >> checkGameInAdvance >> continousGenerate >> blockModel;
+		sstream >> holdToMove >> checkGameInAdvance >> continousGenerate >> blockModel;
 		sstream >> customBlockSizeHeight >> customBlockSizeWidth;
 		for (unsigned i = 0; i < 5; i++) {
 			for (unsigned j = 0; j < 5; j++)