Added a player vector to the gameboard

Author: Databean

include/GameBoard.h

@@ -23,9 +23,10 @@ class GameBoard {
 	std::map<Coordinate, std::unique_ptr<GamePiece>> corners;
 	std::map<Coordinate, std::unique_ptr<GamePiece>> resources;
 	std::vector<std::unique_ptr<Road>> roads;
+    std::vector<std::unique_ptr<Player>> players;
 
 public:
-	GameBoard();
+	GameBoard(std::vector<std::unique_ptr<Player>>&& players);
 	GameBoard(std::istream& in);
 	GameBoard(GameBoard&) = delete;
 	~GameBoard();

src/GameBoard.cpp

@@ -21,8 +21,9 @@ using std::map;
 using std::unique_ptr;
 using std::istream;
 using std::ostream;
+using std::vector;
 
-GameBoard::GameBoard() {
+GameBoard::GameBoard(vector<unique_ptr<Player>>&& players) : players(std::move(players)) {
 	init_resources();
 }
 

src/main.cpp

@@ -9,12 +9,17 @@
 
 #include <iostream>
 #include <utility>
+#include <vector>
+#include <memory>
 
 #include "GameBoard.h"
 #include "UserInput.h"
 #include "Player.h"
 #include "Renderer.h"
 
+using std::vector;
+using std::unique_ptr;
+
 void initGame() {
 
 }
@@ -58,8 +63,12 @@ int main(int argc, char *argv[]) {
 
 	updateViewport(1024, 768);
 
-	Player testPlayer("test");
-	GameBoard testBoard;
+	vector<unique_ptr<Player>> players;
+	players.emplace_back(unique_ptr<Player>(new Player("test")));
+	
+	Player& testPlayer = *(players[0]);
+	
+	GameBoard testBoard(std::move(players));
 
 	bool running = true;
 	while(running) {

tests/testSerialization.cpp

@@ -8,11 +8,18 @@
 
 #include <iostream>
 #include <sstream>
+#include <memory>
+#include <vector>
 
+using std::vector;
+using std::unique_ptr;
 using std::stringstream;
 
 TEST(emptyBoardSerialization) {
-	GameBoard testBoard;
+	vector<unique_ptr<Player>> players;
+	players.emplace_back(unique_ptr<Player>(new Player("test")));
+	
+	GameBoard testBoard(std::move(players));
 
 	stringstream stream;
 	testBoard.save(stream);