can only place one start and destination cell

Author: digocorbellini

Grid.hpp

@@ -4,7 +4,9 @@
 #include <SFML/Graphics.hpp>
 #include "GridCellStates.hpp"
 #include "math.h"
+#include <stdio.h>
 
+using namespace std;
 using namespace sf;
 
 class Grid
@@ -16,6 +18,9 @@ class Grid
 	int cellSize; // in pixels
 	int outlineThickness; // in pixels
 
+	Vector2i *startPos;
+	Vector2i *destPos;
+
 public:
 	Grid(int width, int height, int cellSize);
 
@@ -87,6 +92,9 @@ Grid::Grid(int width, int height, int cellSize)
 	gridHeight = height;
 	this->cellSize = cellSize;
 	outlineThickness = 1;
+
+	startPos = NULL;
+	destPos = NULL;
 }
 
 /// <summary>
@@ -110,6 +118,9 @@ Grid::Grid(int width, int height, int cellSize, int outlineThickness)
 	gridHeight = height;
 	this->cellSize = cellSize;
 	this->outlineThickness = outlineThickness;
+
+	startPos = NULL;
+	destPos = NULL;
 }
 
 /// <summary>
@@ -196,7 +207,62 @@ bool Grid::setValAt(int x, int y, GridValue val)
 {
 	if (validCoords(x, y))
 	{
+		// only allow one start and dest cell
+		if (val == GridValue::START)
+		{
+			// set old start to unoccupied
+			if (startPos == NULL)
+			{
+				startPos = new Vector2i(x, y);
+			}
+			else
+			{
+				// unoccupy old start pos
+				gridArr[startPos->x][startPos->y] = GridValue::UNOCCUPIED;
+
+				// set new start pos
+				startPos->x = x;
+				startPos->y = y;
+			}
+		}
+		else if (val == GridValue::DESTINATION)
+		{
+			// set old dest to unoccupied
+			if (destPos == NULL)
+			{
+				destPos = new Vector2i(x, y);
+			}
+			else
+			{
+				// unoccupy old dest pos
+				gridArr[destPos->x][destPos->y] = GridValue::UNOCCUPIED;
+
+				// set new dest pos
+				destPos->x = x;
+				destPos->y = y;
+			}
+		}
+		else
+		{
+			// make sure that dest/start are removed if the cell is overwritten 
+			GridValue currVal = getValueAt(x, y);
+			if (startPos != NULL && currVal == GridValue::START)
+			{
+				// remove start pos
+				delete(startPos);
+				startPos = NULL;
+			}
+			else if (destPos != NULL && currVal == GridValue::DESTINATION)
+			{
+				// remove destination pos
+				delete(destPos);
+				destPos = NULL;
+			}
+		}
+
+		// set the value at the cell
 		gridArr[x][y] = val;
+
 		return true;
 	}
 
@@ -213,25 +279,34 @@ bool Grid::setValAt(int x, int y, GridValue val)
 bool Grid::setValAt(Vector2i pos, GridValue val)
 {
 	Vector2i gridCoords(screenToGrid(pos));
-	if (validCoords(gridCoords.x, gridCoords.y))
-	{
-		gridArr[gridCoords.x][gridCoords.y] = val;
-		return true;
-	}
-	return false;
+	return setValAt(gridCoords.x, gridCoords.y, val);
 }
 
 /// <summary>
 /// Destructor for a grid object
 /// </summary>
 Grid::~Grid()
 {
+	cout << "startPos == null: " << (startPos == NULL) << endl;
+	cout << "destPos == null: " << (destPos == NULL) << endl;
+
+	// free the grid array
 	for (int i = 0; i < gridWidth; i++)
 	{
 		delete gridArr[i];
 	}
 
 	delete gridArr;
+
+	// free the start and dest positions
+	if (startPos != NULL)
+	{
+		delete(startPos);
+	}
+	if (destPos != NULL)
+	{
+		delete(destPos);
+	}
 }
 
 #endif

Main.cpp

@@ -14,6 +14,9 @@ Grid *grid;
 
 Vector2f selectedGridPos = Vector2f(0, 0);
 
+/// <summary>
+/// Handle the logic for the player cursor on the grid
+/// </summary>
 void playerCursor()
 {
 	// get mouse position
@@ -28,6 +31,9 @@ void playerCursor()
 	window->draw(selectedSquare);
 }
 
+/// <summary>
+/// Handle the player's ability to color the grid
+/// </summary>
 void playerController()
 {
 	// get mouse position
@@ -54,8 +60,7 @@ void playerController()
 		// place destination cell
 		grid->setValAt(mousePos, GridValue::DESTINATION);
 	}
-	else if (Mouse::isButtonPressed(Mouse::Button::Middle) 
-			|| Keyboard::isKeyPressed(Keyboard::Key::Space))
+	else if (Mouse::isButtonPressed(Mouse::Button::Middle) || Keyboard::isKeyPressed(Keyboard::Key::Space))
 	{
 		// middle mouse button
 		// place starting cell
@@ -98,4 +103,6 @@ int main()
 		// display window
 		window->display();
 	}
+
+	delete(grid);
 }