Switched to pointers for the board variable in Player. Tests stopped

crashing, but are not quite functional.

Author: PickledMonkey

include/Player.h

@@ -27,7 +27,7 @@ const int WOOL_INDEX = 4;
 
 class DevelopmentCard;
 class Deck;
-
+class GameBoard;
 
 
 
@@ -40,7 +40,7 @@ class Player {
     int armySize;
     int longestRoad;
     int victoryPoints;
-    std::shared_ptr<GameBoard> board;
+    GameBoard* board;
     int resources[5];
 
 
@@ -63,6 +63,9 @@ class Player {
     void buyCard(std::unique_ptr<DevelopmentCard> card);
     std::string getName() const;
 
+    GameBoard* getBoard();
+    void setBoard(GameBoard* newboard);
+
     void playCard(DevelopmentCard* card);
 
     bool canBuyRoad();
@@ -88,8 +91,6 @@ class Player {
 
     void addResource(int resourceType, int delta);
 
-    std::shared_ptr<GameBoard> getBoard();
-
 	void accept(GameVisitor& visitor);
 	bool operator==(const Player& player) const;
 };

src/Player.cpp

@@ -118,6 +118,13 @@ int Player::getVictoryPoints()
     return victoryPoints;
 }
 
+GameBoard* Player::getBoard(){
+	return board;
+}
+
+void Player::setBoard(GameBoard * newboard){
+	board = newboard;
+}
 
 void Player::buyCard(std::unique_ptr<DevelopmentCard> card)
 {
@@ -273,11 +280,6 @@ std::string Player::getName() const
     return name;
 }
 
-std::shared_ptr<GameBoard> Player::getBoard(){
-	return board;
-}
-
-
 void Player::addResource(int resourceType, int delta) {
 	resources[resourceType] += delta;
 

tests/test_DevelopmentCards.cpp

@@ -15,6 +15,8 @@ TEST(RoadBuildingCard_good){
 	players.emplace_back(new Player("tester"));
 	Player& test_player = *players[0];
 	GameBoard * test_board = new GameBoard(std::move(players));
+	test_player.setBoard(test_board);
+
 
 
 	RoadBuildingCard test_card(&test_player);
@@ -23,6 +25,7 @@ TEST(RoadBuildingCard_good){
 		test_card.playCard(Coordinate(0,0), Coordinate(-1,1), Coordinate(0,0), Coordinate(1,0));
 		CHECK(true);
 	} catch (std::invalid_argument& e){
+		std::cout << e.what();
 		CHECK(false);
 	}
 
@@ -33,7 +36,7 @@ TEST(RoadBuildingCard_bad){
 	players.emplace_back(new Player("tester"));
 	Player& test_player = *players[0];
 	GameBoard * test_board = new GameBoard(std::move(players));
-
+	test_player.setBoard(test_board);
 
 	RoadBuildingCard test_card(&test_player);