vixtory screen, tests

Author: ankit21

include/GameBoard.h

@@ -92,6 +92,7 @@ class GameBoard {
 
 	void endTurn();
 	Player& getCurrentPlayer() const;
+	bool hasWinner();
 	Player& getWinner() const;
 
 	int getMaxVictoryPoints();

src/GameBoard.cpp

@@ -1058,6 +1058,18 @@ Player& GameBoard::getCurrentPlayer() const
 }
 
 
+
+/**
+ * @return true if game has a winner, false otherwise
+ */
+bool GameBoard::hasWinner()
+{
+	if(winner == -1)
+		return false;
+	return true;
+}
+
+
 /**
  * @return reference to the winner if there is one, null otherwise
  */
@@ -1066,7 +1078,7 @@ Player& GameBoard::getWinner() const
 	if(winner != -1 && winner < players.size())
 		return *players[winner];
 
-	return nullptr;
+	return *players[0];
 }
 
 

src/GameView.cpp

@@ -163,7 +163,7 @@ void GameView::render() {
 	drawCardCount(font, fontSize);
 	drawResourceCount(font, fontSize);
 
-	if(model.getWinner != nullptr)
+	if(model.hasWinner())
 			renderText(font, fontSize, {.2, .4}, {.8, .6}, model.getWinner().getName() + " Wins");
 
 	glFlush();