Serialization is up and running now

Author: PickledMonkey

src/GameBoard.cpp

@@ -163,6 +163,7 @@ GameBoard::GameBoard(istream& in) {
 		resources[coord] = unique_ptr<ResourceTile>(new ResourceTile(*this, coord, type, diceValue));
 	}
 
+
 	auto playerElements = doc.RootElement()->FirstChildElement("players");
 	if(playerElements) {
 		for(auto playerElement = playerElements->FirstChildElement(); playerElement; playerElement = playerElement->NextSiblingElement()) {
@@ -171,6 +172,7 @@ GameBoard::GameBoard(istream& in) {
 		}
 	}
 
+
 	auto roadElements = doc.RootElement()->FirstChildElement("roads");
 	if(roadElements) {
 		for(auto roadElement = roadElements->FirstChildElement(); roadElement; roadElement = roadElement->NextSiblingElement()) {

src/Player.cpp

@@ -61,6 +61,9 @@ Player::Player(GameBoard& board, XMLElement* elem) : board(board)
 	for(auto& r : resources) {
 		r = 0;
 	}
+	for(auto& t : tradeModifiers) {
+			t = 4;
+		}
 	for(auto& c : developmentCards) {
 		c = 0;
 	}
@@ -71,15 +74,16 @@ Player::Player(GameBoard& board, XMLElement* elem) : board(board)
 	addWheat(fromString<int>(elem->FirstChildElement("wheat")->FirstChild()->Value()));
 	addWool(fromString<int>(elem->FirstChildElement("wool")->FirstChild()->Value()));
 
-	developmentCards[KNIGHT]+=fromString<int>(elem->FirstChildElement("knight")->FirstChild()->Value());
-	developmentCards[VICTORYPOINT]+=fromString<int>(elem->FirstChildElement("victorypoint")->FirstChild()->Value());
-	developmentCards[YEAROFPLENTY]+=fromString<int>(elem->FirstChildElement("yearofplenty")->FirstChild()->Value());
-	developmentCards[MONOPOLY]+=fromString<int>(elem->FirstChildElement("monopoly")->FirstChild()->Value());
-	developmentCards[ROADBUILDING]+=fromString<int>(elem->FirstChildElement("roadbuilding")->FirstChild()->Value());
+	developmentCards[VICTORYPOINT] = (fromString<int>(elem->FirstChildElement("victory_point")->FirstChild()->Value()));
+	developmentCards[KNIGHT]+= (fromString<int>(elem->FirstChildElement("knight")->FirstChild()->Value()));
+	developmentCards[YEAROFPLENTY]+= (fromString<int>(elem->FirstChildElement("year_of_plenty")->FirstChild()->Value()));
+	developmentCards[MONOPOLY]+= (fromString<int>(elem->FirstChildElement("monopoly")->FirstChild()->Value()));
+	developmentCards[ROADBUILDING]+= (fromString<int>(elem->FirstChildElement("road_building")->FirstChild()->Value()));
 
 	armySize = 0;
 	longestRoad = 0;
 	victoryPoints = 0;
+	baseVictoryPoints = 0;
 }
 
 /**

src/Serialization.cpp

@@ -166,27 +166,28 @@ void XMLVisitor::visit(Player& player) {
 	XMLElement* woolElement = xmldoc.NewElement("wool");
 	woolElement->InsertEndChild(xmldoc.NewText(toString(player.getWool()).c_str()));
 	newPlayerElement->InsertEndChild(woolElement);
+
 
-	XMLElement* victoryElement = xmldoc.NewElement("victorypoint");
-	woolElement->InsertEndChild(xmldoc.NewText(toString(player.getVictoryCards()).c_str()));
+	XMLElement* victoryElement = xmldoc.NewElement("victory_point");
+	victoryElement->InsertEndChild(xmldoc.NewText(toString(player.getVictoryCards()).c_str()));
 	newPlayerElement->InsertEndChild(victoryElement);
 
 	XMLElement* knightElement = xmldoc.NewElement("knight");
-	woolElement->InsertEndChild(xmldoc.NewText(toString(player.getKnightCards()).c_str()));
+	knightElement->InsertEndChild(xmldoc.NewText(toString(player.getKnightCards()).c_str()));
 	newPlayerElement->InsertEndChild(knightElement);
 
-	XMLElement* yearOfPlentyElement = xmldoc.NewElement("yearofplenty");
-	woolElement->InsertEndChild(xmldoc.NewText(toString(player.getYearOfPlentyCards()).c_str()));
+	XMLElement* yearOfPlentyElement = xmldoc.NewElement("year_of_plenty");
+	yearOfPlentyElement->InsertEndChild(xmldoc.NewText(toString(player.getYearOfPlentyCards()).c_str()));
 	newPlayerElement->InsertEndChild(yearOfPlentyElement);
 
 	XMLElement* monopolyElement = xmldoc.NewElement("monopoly");
-	woolElement->InsertEndChild(xmldoc.NewText(toString(player.getMonopolyCards()).c_str()));
+	monopolyElement->InsertEndChild(xmldoc.NewText(toString(player.getMonopolyCards()).c_str()));
 	newPlayerElement->InsertEndChild(monopolyElement);
 
-	XMLElement* roadBuildingElement = xmldoc.NewElement("roadbuilding");
-	woolElement->InsertEndChild(xmldoc.NewText(toString(player.getRoadBuildingCards()).c_str()));
+	XMLElement* roadBuildingElement = xmldoc.NewElement("road_building");
+	roadBuildingElement->InsertEndChild(xmldoc.NewText(toString(player.getRoadBuildingCards()).c_str()));
 	newPlayerElement->InsertEndChild(roadBuildingElement);
-	
+
 	playersElement->InsertEndChild(newPlayerElement);
 	playerElementMap[player.getName()] = newPlayerElement;
 }

tests/testSerialization.cpp

@@ -29,31 +29,38 @@ TEST(emptyBoardSerialization) {
 
 TEST(multiplePlayerSerialization) {
 	GameBoard testBoard({"test", "test2"});
-
 	stringstream stream;
 	testBoard.save(stream);
 
 	GameBoard copyBoard(stream);
 
 	CHECK(testBoard == copyBoard);
 }
-/*
+
 TEST(testCardSerialization) {
 	GameBoard testBoard({"test"});
 	Player& testPlayer = testBoard.getPlayer(0);
-	testPlayer.buyCard(unique_ptr<DevelopmentCard>(new KnightCard(testBoard)));
-	testPlayer.buyCard(unique_ptr<DevelopmentCard>(new VictoryPointCard(testBoard)));
-	testPlayer.buyCard(unique_ptr<DevelopmentCard>(new YearOfPlentyCard(testBoard)));
-	testPlayer.buyCard(unique_ptr<DevelopmentCard>(new MonopolyCard(testBoard)));
-	testPlayer.buyCard(unique_ptr<DevelopmentCard>(new RoadBuildingCard(testBoard)));
+
+
+	std::unique_ptr<DevelopmentCard> knight_card = unique_ptr<DevelopmentCard>(new KnightCard());
+	std::unique_ptr<DevelopmentCard> victory_card = unique_ptr<DevelopmentCard>(new VictoryPointCard());
+	std::unique_ptr<DevelopmentCard> plenty_card = unique_ptr<DevelopmentCard>(new YearOfPlentyCard());
+	std::unique_ptr<DevelopmentCard> monopoly_card = unique_ptr<DevelopmentCard>(new MonopolyCard());
+	std::unique_ptr<DevelopmentCard> road_card = std::unique_ptr<DevelopmentCard>(new RoadBuildingCard());
+
+	testPlayer.buyCard(knight_card);
+	testPlayer.buyCard(victory_card);
+	testPlayer.buyCard(plenty_card);
+	testPlayer.buyCard(monopoly_card);
+	testPlayer.buyCard(road_card);
 
 	stringstream stream;
 	testBoard.save(stream);
 
 	GameBoard copyBoard(stream);
 
 	CHECK(testBoard == copyBoard);
-}*/
+}
 
 TEST(roadSerialization) {
 	GameBoard testBoard({"test", "test2"});