Commiting changes before the final merge, serialization still doesn't

work.

Author: PickledMonkey

src/GameBoard.cpp

@@ -324,15 +324,6 @@ void GameBoard::endTurn()
 	startTurn();
 }
 
-/**
- * @return reference to the current Player
- */
-Player& GameBoard::getCurrentPlayer() const
-{
-	return *players[currentTurn];
-}
-
-
 /**
  * @return The no of Victory points needed to win the game
  */
@@ -915,11 +906,12 @@ const std::vector<std::unique_ptr<Player>>& GameBoard::getPlayers() const {
 
 /**
  * WARNING THIS FUNCTION GIVES THE PLAYERS CHEATS SO I COULD DEBUG
+ * @return reference to the current Player
  */
-Player& GameBoard::getCurrentPlayer(){
-	Player & curr_player = getPlayer(0);
-	curr_player.giveDevCardBoon();
-	return getPlayer(0);
+Player& GameBoard::getCurrentPlayer() const
+{
+	(*players[currentTurn]).giveDevCardBoon();
+	return *players[currentTurn];
 }
 
 /**

src/main.cpp

@@ -37,7 +37,7 @@ void initOpenGL() {
  * @param width The new width of the viewport.
  * @param height The new height of the viewport.
  */
-void updateViewport(int width, int height) {
+int updateViewport(int width, int height) {
 	glViewport(0, 0, width, height); 
 	glMatrixMode(GL_PROJECTION);
 	glLoadIdentity ();