From 386678ab217460f9fa17ba9e88c0566e8b885fce Mon Sep 17 00:00:00 2001
From: ElnuDev <elnu@elnu.com>
Date: Sun, 6 Mar 2022 10:15:29 -0800
Subject: [PATCH] Add game over reset

---
 src/Main.cpp | 43 +++++++++++++++++++++++++++----------------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/src/Main.cpp b/src/Main.cpp
index c59db33..6578e95 100644
--- a/src/Main.cpp
+++ b/src/Main.cpp
@@ -7,6 +7,7 @@
 #include <SFML/System/Vector2.hpp>
 #include <SFML/Window/Keyboard.hpp>
 #include <iostream>
+#include <iterator>
 #include <string>
 
 #define WINDOW_WIDTH 280
@@ -303,28 +304,38 @@ int main()
 
 		// Landing (transfering block to grid and reinitializing)
 		if (landed) {
-			for (auto tile : block.get_tiles()) {
-				grid[tile.y][tile.x] = block.type->tile_type;
-			}
-			// Check for completed rows
-			for (int y = 0; y < GRID_HEIGHT; y++) {
-				bool completed = true;
-				for (int x = 0; x < GRID_WIDTH; x++) {
-					if (!grid[y][x]) {
-						completed = false;
-						break;
+			if (block.position.y == 0) {
+				score = 0;
+				text.setString("0");
+				for (int y = 0; y < GRID_HEIGHT; y++) {
+					for (int x = 0; x < GRID_WIDTH; x++) {
+						grid[y][x] = nullptr;
 					}
 				}
-				if (!completed) {
-					continue;
+			} else {
+				for (auto tile : block.get_tiles()) {
+					grid[tile.y][tile.x] = block.type->tile_type;
 				}
-				for (int z = y - 1; z >= 0; z--) {
+				// Check for completed rows
+				for (int y = 0; y < GRID_HEIGHT; y++) {
+					bool completed = true;
 					for (int x = 0; x < GRID_WIDTH; x++) {
-						grid[z + 1][x] = grid[z][x];
+						if (!grid[y][x]) {
+							completed = false;
+							break;
+						}
+					}
+					if (!completed) {
+						continue;
+					}
+					for (int z = y - 1; z >= 0; z--) {
+						for (int x = 0; x < GRID_WIDTH; x++) {
+							grid[z + 1][x] = grid[z][x];
+						}
 					}
+					score++;
+					text.setString(std::to_string(score));
 				}
-				score++;
-				text.setString(std::to_string(score));
 			}
 			block = Block();
 		} else if(is_update_frame) {