Another bugfix

logic.cpp

@@ -1,7 +1,9 @@
 #include "logic.h"
 #include "time.h"
+#include <iostream>
 
 void GameLogic::newField(unsigned xpos, unsigned ypos) {
+	remainingMines = numberOfMines;
 	srand(time(NULL));
 	for(int i = 0; i < numberOfMines; i++) {
 		unsigned x = rand() % fieldWidth;
@@ -82,7 +84,6 @@ int GameLogic::open(unsigned x, unsigned y) {
 		return 0;
 
 	recOpen(x, y);
-	//field[ax + ay * fieldWidth].isOpen = true;
 
 	return 1;
 }

logic.h

@@ -3,7 +3,7 @@
 
 constexpr unsigned fieldWidth    = 16;
 constexpr unsigned fieldHeight   = 16;
-constexpr unsigned numberOfMines = (fieldWidth*fieldHeight) / 32;
+constexpr unsigned numberOfMines = (fieldWidth*fieldHeight) / 16;
 
 struct Cell {
 	bool isOpen = false;

renderer.cpp

@@ -2,7 +2,7 @@
 #include <unistd.h>
 
 Renderer::Renderer() {
-	window = new sf::RenderWindow(sf::VideoMode(windowWidth, windowHeight), "Minesweeper");
+	window = new sf::RenderWindow(sf::VideoMode(windowWidth, windowHeight), "Minesweeper", sf::Style::Titlebar | sf::Style::Close);
 	window->setFramerateLimit(25);
 	for(int i = 0; i < 13; i++) {
 		textures[i].loadFromFile("contents/cells.png", sf::IntRect(i*16, 0, 16, 16));
@@ -17,6 +17,11 @@ void Renderer::mainLoop() {
 			if(event.type == sf::Event::Closed) {
 				window->close();
 			}
+			if (sf::Keyboard::isKeyPressed(sf::Keyboard::Escape)) {
+				logic.isInMainMenu = true;
+				logic.isFirstTurn = true;
+				logic.isLoseOrWin = false;
+			}
 			if (event.type == sf::Event::MouseButtonPressed) {
 				mouseClick(event);
 			}
@@ -99,10 +104,12 @@ void Renderer::mouseClick(const sf::Event& event) {
 	const unsigned cellX = x / columnWidth;
 	const unsigned cellY = y / rowHeight;
 
+
+
 	if(logic.isLoseOrWin) {
-		logic.isLoseOrWin = false;
 		logic.isInMainMenu = true;
 		logic.isFirstTurn = true;
+		logic.isLoseOrWin = false;
 		return;
 	}
 
@@ -122,18 +129,24 @@ void Renderer::mouseClick(const sf::Event& event) {
 		logic.newField(cellX, cellY);
 		logic.open(cellX, cellY);
 
-	} else if (event.mouseButton.button == sf::Mouse::Right) {
-
-		logic.mark(cellX, cellY);
-
 	} else if (event.mouseButton.button == sf::Mouse::Left 
 								&& !logic.getCell(cellX, cellY).isOpen
 								&& !logic.getCell(cellX, cellY).isFlagged
 								&& !logic.getCell(cellX, cellY).isSuspect
 								&& !logic.isFirstTurn) {
+
 		int res = logic.open(cellX, cellY);
-		if(res == 0 || logic.remainingMines == 0) {
+		if(res == 0) {
 			logic.isLoseOrWin = true;
-		} 
-	}
+		}
+		if(logic.remainingMines == 0) {
+			logic.isLoseOrWin = true;
+		}
+
+	} else if (event.mouseButton.button == sf::Mouse::Right) {
+		logic.mark(cellX, cellY);
+		if(logic.remainingMines == 0) {
+			logic.isLoseOrWin = true;
+		}
+	} 
 }