Fixed compilation errors.

Author: Databean

include/DevelopmentCard.h

@@ -23,7 +23,7 @@ enum DevCardType { KNIGHT, VICTORYPOINT, YEAROFPLENTY, MONOPOLY, ROADBUILDING };
 
 class DevelopmentCard {
 
-private:
+protected:
     DevCardType type;
     GameBoard *board;
 public:

include/GameBoard.h

@@ -104,7 +104,7 @@ class GameBoard {
 	const std::vector<std::unique_ptr<Player>>& getPlayers() const;
 
 	int getNoOfPlayers();
-	std::unique_ptr<Player> getPlayer(int index);
+	Player& getPlayer(int index);
 
     bool testRollChecking(int* rolls);
 

include/Player.h

@@ -103,7 +103,7 @@ class Player {
     void addWheat(int resource);
     void addWool(int resource);
 
-    int getResource(int resourceType); //
+    int getResource(int resourceType) const; //
     void addResource(int resourceType, int delta);
 
 	void accept(GameVisitor& visitor);

include/Serialization.h

@@ -19,6 +19,8 @@ class XMLVisitor : public GameVisitor {
 	std::map<std::string, tinyxml2::XMLElement*> playerElementMap;
 	std::set<Road*> serializedRoads;
 
+	Player* lastPlayer;
+	
 	tinyxml2::XMLElement* coordinateElement(const Coordinate& c);
 public:
 	XMLVisitor();

src/Deck.cpp

@@ -16,27 +16,27 @@ Deck::Deck()
 	// TODO Auto-generated constructor stub
 	for(int i = 0; i < 15; i++)
 	{
-		DevelopmentCard* card = new KnightCard(NULL);
+		DevelopmentCard* card = new KnightCard();
 		this->deck.push_back(card);
 	}
 	for(int i = 0; i < 4; i++)
 	{
-		DevelopmentCard* card = new VictoryPointCard(NULL);
+		DevelopmentCard* card = new VictoryPointCard();
 		this->deck.push_back(card);
 	}
 	for(int i = 0; i < 2; i++)
 	{
-		DevelopmentCard* card = new YearOfPlentyCard(NULL);
+		DevelopmentCard* card = new YearOfPlentyCard();
 		this->deck.push_back(card);
 	}
 	for(int i = 0; i < 2; i++)
 	{
-		DevelopmentCard* card = new MonopolyCard(NULL);
+		DevelopmentCard* card = new MonopolyCard();
 		this->deck.push_back(card);
 	}
 	for(int i = 0; i < 2; i++)
 	{
-		DevelopmentCard* card = new RoadBuildingCard(NULL);
+		DevelopmentCard* card = new RoadBuildingCard();
 		this->deck.push_back(card);
 	}
 

src/DevelopmentCard.cpp

@@ -92,9 +92,9 @@ void MonopolyCard::playCard(Player *player, int rType)
 
 	for(int i=0; i<board->getNoOfPlayers(); i++)
 	{
-		Player* p = board->getPlayer(i);
-		totalResourceCount += p->getResource(rType);
-		p->addResource(rType, (-1*p->getResource(rType)) );
+		Player& p = board->getPlayer(i);
+		totalResourceCount += p.getResource(rType);
+		p.addResource(rType, (-1*p.getResource(rType)) );
 	}
 	player->addResource(rType, totalResourceCount);
 }

src/GameBoard.cpp

@@ -735,14 +735,15 @@ int GameBoard::getNoOfPlayers()
 
 
 /**
+ * @param index The index to look at.
  * @return player at index index
  */
-std::unique_ptr<Player> GameBoard::getPlayer(int index)
+Player& GameBoard::getPlayer(int index)
 {
 	if(index >= getNoOfPlayers())
-		return NULL;
+		throw std::runtime_error("Invalid player index.");
 
-	return players[index];
+	return *players[index];
 }
 
 

src/Player.cpp

@@ -58,11 +58,11 @@ Player::Player(XMLElement* elem)
 	XMLElement* cardsElement = elem->FirstChildElement("cards");
 	for(auto cardElem = cardsElement->FirstChildElement("card"); cardElem; cardElem = cardElem->NextSiblingElement("card")) {
 		static const map<std::string, std::function<std::unique_ptr<DevelopmentCard>(void)>> typeToCard = {
-			std::pair<std::string, std::function<std::unique_ptr<DevelopmentCard>(void)>>("knight", [this]() -> std::unique_ptr<DevelopmentCard> { return std::unique_ptr<DevelopmentCard>(new KnightCard(this)); }),
-			std::pair<std::string, std::function<std::unique_ptr<DevelopmentCard>(void)>>("victorypoint", [this]() -> std::unique_ptr<DevelopmentCard> { return std::unique_ptr<DevelopmentCard>(new VictoryPointCard(this)); }),
-			std::pair<std::string, std::function<std::unique_ptr<DevelopmentCard>(void)>>("yearofplenty", [this]() -> std::unique_ptr<DevelopmentCard> { return std::unique_ptr<DevelopmentCard>(new YearOfPlentyCard(this)); }),
-			std::pair<std::string, std::function<std::unique_ptr<DevelopmentCard>(void)>>("monopoly", [this]() -> std::unique_ptr<DevelopmentCard> { return std::unique_ptr<DevelopmentCard>(new MonopolyCard(this)); }),
-			std::pair<std::string, std::function<std::unique_ptr<DevelopmentCard>(void)>>("roadbuilding", [this]() -> std::unique_ptr<DevelopmentCard> { return std::unique_ptr<DevelopmentCard>(new RoadBuildingCard(this)); }),
+			std::pair<std::string, std::function<std::unique_ptr<DevelopmentCard>(void)>>("knight", [this]() -> std::unique_ptr<DevelopmentCard> { return std::unique_ptr<DevelopmentCard>(new KnightCard()); }),
+			std::pair<std::string, std::function<std::unique_ptr<DevelopmentCard>(void)>>("victorypoint", [this]() -> std::unique_ptr<DevelopmentCard> { return std::unique_ptr<DevelopmentCard>(new VictoryPointCard()); }),
+			std::pair<std::string, std::function<std::unique_ptr<DevelopmentCard>(void)>>("yearofplenty", [this]() -> std::unique_ptr<DevelopmentCard> { return std::unique_ptr<DevelopmentCard>(new YearOfPlentyCard()); }),
+			std::pair<std::string, std::function<std::unique_ptr<DevelopmentCard>(void)>>("monopoly", [this]() -> std::unique_ptr<DevelopmentCard> { return std::unique_ptr<DevelopmentCard>(new MonopolyCard()); }),
+			std::pair<std::string, std::function<std::unique_ptr<DevelopmentCard>(void)>>("roadbuilding", [this]() -> std::unique_ptr<DevelopmentCard> { return std::unique_ptr<DevelopmentCard>(new RoadBuildingCard()); }),
 		};
 		auto typeIt = typeToCard.find(std::string(cardElem->FirstChildElement("type")->FirstChild()->Value()));
 		if(typeIt == typeToCard.end()) {
@@ -384,7 +384,7 @@ bool Player::acceptOffer(Player* p, int offer[], int demand[])
  */
 int Player::getRandomResource()
 {
-	int total = getWood() + getBrick() + getOre() + getWheat() + getWool();
+	//int total = getWood() + getBrick() + getOre() + getWheat() + getWool();
 	int randomNo = 0;
 
 	if(getWood()!=0 && randomNo <= getWood())
@@ -416,6 +416,18 @@ int Player::getRandomResource()
 
 }
 
+/**
+ * Get the resources a player has of a given type.
+ * @param resourceType The index to get the resource count of.
+ * @return The amount of the resource the player has.
+ */
+int Player::getResource(int resourceType) const {
+	if(resourceType < 5) {
+		return resources[resourceType];
+	} else {
+		throw std::runtime_error("Type index is out of bounds.");
+	}
+}
 
 /**
  * Determine if the player has a valid (nonnegative) set of resources.

src/Serialization.cpp

@@ -21,7 +21,7 @@ using tinyxml2::XMLText;
 /**
  * Construct the serialization visitor.
  */
-XMLVisitor::XMLVisitor() {
+XMLVisitor::XMLVisitor() : lastPlayer(nullptr) {
 	xmldoc.InsertEndChild(xmldoc.NewElement("catangame"));
 	//xmldoc.RootElement()->SetName("catangame");
 }
@@ -150,6 +150,8 @@ void XMLVisitor::visit(Player& player) {
 
 	playersElement->InsertEndChild(newPlayerElement);
 	playerElementMap[player.getName()] = newPlayerElement;
+	
+	lastPlayer = &player;
 }
 
 /**
@@ -193,7 +195,10 @@ void XMLVisitor::visit(ResourceTile& tile) {
  * @param card The card to serialize.
  */
 void XMLVisitor::visit(DevelopmentCard& card) {
-	auto playerElementIt = playerElementMap.find(card.getOwner()->getName());
+	if(lastPlayer == nullptr) {
+		throw runtime_error("Don't know which player to assign this card to.");
+	}
+	auto playerElementIt = playerElementMap.find(lastPlayer->getName());
 	if(playerElementIt == playerElementMap.end()) {
 		throw runtime_error("This card belongs to a player that hasn't been saved!");
 	}