settlements now unplaceable on resource tiles. Upgrade ctor checks for existence of settlement

Author: apolitakis

src/GameBoard.cpp

@@ -461,7 +461,9 @@ int GameBoard::FindLongestRoad_FromPoint(Coordinate curr, const Player & owner,
 
 
 void GameBoard::PlaceSettlement(Coordinate location, Player& Owner){
-	corners[location] = std::unique_ptr<CornerPiece>(new Settlement(*this, location, Owner));
+	if(resources.find(location) == resources.end() && !outOfBounds(location))
+		corners[location] = std::unique_ptr<CornerPiece>(new Settlement(*this, location, Owner));
+
 }
 
 void GameBoard::PlaceCity(Coordinate location, Player& Owner){
@@ -470,6 +472,7 @@ void GameBoard::PlaceCity(Coordinate location, Player& Owner){
 }
 
 void GameBoard::UpgradeSettlement(Coordinate location){
+	if(corners.find(location) != corners.end())
 	corners[location] = std::unique_ptr<CornerPiece>(new City(*corners[location])); //TODO test for memory leak
 }
 

tests/test_GameBoard.cpp

@@ -183,7 +183,7 @@ TEST(longest_road_simple){
 }
 
 TEST(payout_simple) {
-	/*std::vector<std::unique_ptr<Player>> players {};
+	std::vector<std::unique_ptr<Player>> players {};
 	players.emplace_back(new Player("tester"));
 	Player& test_player = *players[0];
 	GameBoard * test_board = new GameBoard(std::move(players));
@@ -197,7 +197,7 @@ TEST(payout_simple) {
 	CHECK(!(test_player.getWheat() || test_player.getWood() || 
 		test_player.getOre() || test_player.getBrick() || test_player.getWool()));
 	delete test_board;
-	delete &test_player;*/
+	delete &test_player;
 
 }