From 47fee51b085a7cb8ae3f06ee313f874c3da5005d Mon Sep 17 00:00:00 2001
From: MitchellHansen <mitchellhansen0@gmail.com>
Date: Sat, 22 Aug 2015 06:55:28 -0700
Subject: [PATCH] small commit

---
 aStar/Explorer.cpp |  1 +
 aStar/Pather.cpp   | 14 +++++++-------
 aStar/Pather.h     |  8 ++++----
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/aStar/Explorer.cpp b/aStar/Explorer.cpp
index d26cd51..f6c2028 100644
--- a/aStar/Explorer.cpp
+++ b/aStar/Explorer.cpp
@@ -75,5 +75,6 @@ bool Explorer::move() {
 // A*
 bool Explorer::plan(sf::Vector2i destination_) {
 
+	
 	return true;
 }
diff --git a/aStar/Pather.cpp b/aStar/Pather.cpp
index dab7527..a2e09e0 100644
--- a/aStar/Pather.cpp
+++ b/aStar/Pather.cpp
@@ -107,7 +107,7 @@ sf::Vector2i Pather::getEndNodePosition() {
 	return end_node->xy;
 }
 
-std::vector<int> Pather::pathTo(sf::Vector2i start, sf::Vector2i end) {
+std::deque<int> Pather::pathTo(sf::Vector2i start, sf::Vector2i end) {
 
 	// Clear the visited map for erroneous data
 	for (int i = 0; i < Map::CELLS_WIDTH; i++) {
@@ -129,13 +129,13 @@ std::vector<int> Pather::pathTo(sf::Vector2i start, sf::Vector2i end) {
 	openList.emplace(start_node, 0);
 
 	early_exit = false;
-	//path_list = Loop();
+	path_list = loop();
 
 	return path_list;
 }
 
 
-std::vector<int> Pather::loop() {
+std::deque<int> Pather::loop() {
 	while (!openList.empty() && !early_exit) {
 		// Early exit jankyness, need to change this
 		if (closedList.size() > 3000) {
@@ -172,17 +172,17 @@ std::vector<int> Pather::loop() {
 		}
 	}
 
-	std::vector<int> return_path = returnPath();
+	std::deque<int> return_path = returnPath();
 	if (no_path || return_path.empty()) {
-		return std::vector<int>(0, 0);
+		return std::deque<int>();
 		std::cout << " no return path " << std::endl;
 	}
 
 	return return_path;
 }
 
-std::vector<int> Pather::returnPath() {
-	std::vector<int> path;
+std::deque<int> Pather::returnPath() {
+	std::deque<int> path;
 
 	while (active_node != nullptr) {
 		path.push_back(active_node->cameFrom);
diff --git a/aStar/Pather.h b/aStar/Pather.h
index 37913dc..ab2a681 100644
--- a/aStar/Pather.h
+++ b/aStar/Pather.h
@@ -37,9 +37,9 @@ public:
 	std::unordered_map<node*, int> closedList;
 	int visitedMap[App::WINDOW_HEIGHT][App::WINDOW_WIDTH];
 
-	 std::vector<int> pathTo(sf::Vector2i start, sf::Vector2i end);
-	 std::vector<int> loop();
-	 std::vector<int> returnPath();
+	 std::deque<int> pathTo(sf::Vector2i start, sf::Vector2i end);
+	 std::deque<int> loop();
+	 std::deque<int> returnPath();
 
 	 sf::Vector2i getEndNodePosition();
 
@@ -51,7 +51,7 @@ public:
 
 private:
 
-	std::vector<int> path_list;
+	std::deque<int> path_list;
 	node* end_node;
 
 };