Removed methods that calculated victory point totals without cards

Author: malecki1

include/Player.h

@@ -73,9 +73,6 @@ class Player {
 
     std::tuple<float, float, float> getColor() const;
 
-    int getVictoryPointsWithoutCards();
-    int getVictoryPointCards();
-
     int getDevCardsInHand();
 
     bool buyCard(std::unique_ptr<DevelopmentCard> &card);

src/Player.cpp

@@ -309,16 +309,6 @@ void Player::updateVictoryPoints()
 	victoryPoints = sum_points;
 }
 
-/**
- * The number of victory points a player has, not counting victory point cards.
- * @return Victory points sans cards.
- */
-int Player::getVictoryPointsWithoutCards()
-{
-    updateVictoryPoints();
-    return victoryPoints - developmentCards[VICTORYPOINT];
-}
-
 /**
  * The number of victory points a player has.
  */
@@ -329,16 +319,6 @@ int Player::getVictoryPoints()
 }
 
 
-/**
- * The number of victory points the player has from victory point cards.
- * @return Victory points from cards.
- */
-int Player::getVictoryPointCards()
-{
-	return developmentCards[VICTORYPOINT];
-}
-
-
 /**
  * Acquire a development card.
  * @param card An owning pointer to the card the player acquired.

tests/test_DevelopmentCards.cpp

@@ -98,15 +98,12 @@ TEST(DevCardTest, RoadBuildingCard){
 }
 
 void testVictoryPointCard(Player & test_player, bool correct_result){
-	int prevPoints = test_player.getVictoryPointsWithoutCards();
 	int prevCards = test_player.getVictoryCards();
 
 	ASSERT_EQ(test_player.playVictoryCard(), correct_result);
 	if(correct_result){
-		ASSERT_EQ(prevPoints, test_player.getVictoryPointsWithoutCards() -1);
 		ASSERT_EQ(prevCards, test_player.getVictoryCards()+1);
 	}else{
-		ASSERT_EQ(prevPoints, test_player.getVictoryPointsWithoutCards());
 		ASSERT_EQ(prevCards, test_player.getVictoryCards());
 	}
 

tests/test_Player.cpp

@@ -283,7 +283,6 @@ TEST(PlayerTest, UpdateVictoryPoints_VictoryCards){
 	Player& test_player = test_board.getPlayer(0);
 
 	ASSERT_EQ(test_player.getVictoryPoints(), 0);
-	ASSERT_EQ(test_player.getVictoryPointsWithoutCards(), 0);
 
 	std::unique_ptr<DevelopmentCard> test_VictoryCard = std::unique_ptr<DevelopmentCard>(new VictoryPointCard());
 	test_player.addOre(1);
@@ -292,7 +291,6 @@ TEST(PlayerTest, UpdateVictoryPoints_VictoryCards){
 
 	test_player.buyCard(test_VictoryCard);
 	ASSERT_EQ(test_player.getVictoryPoints(), 1);
-	ASSERT_EQ(test_player.getVictoryPointsWithoutCards(), 0);
 }
 
 TEST(PlayerTest, UpdateVictoryPoints_LargestArmy){