Added an owner to CornerPiece

Author: Databean

include/City.h

@@ -7,7 +7,7 @@ class City : public CornerPiece {
 private:
 
 public:
-	City(GameBoard& board, Coordinate location);
+	City(GameBoard& board, Coordinate location, Player& owner);
 	City(City&) = delete;
 	~City();
 	City& operator=(City&) = delete;

include/CornerPiece.h

@@ -2,15 +2,19 @@
 #define CORNERPIECE_H
 
 #include "GamePiece.h"
+#include "Player.h"
 
 class CornerPiece : public GamePiece {
 private:
-
+	Player& owner;
 public:
-	CornerPiece(GameBoard& board, Coordinate location);
+	CornerPiece(GameBoard& board, Coordinate location, Player& owner);
 	CornerPiece(CornerPiece&) = delete;
 	~CornerPiece();
 	CornerPiece& operator=(CornerPiece&) = delete;
+	
+	Player& getOwner();
+	const Player& getOwner() const;
 };
 
 #endif

include/Settlement.h

@@ -7,7 +7,7 @@ class Settlement : public CornerPiece {
 private:
 
 public:
-	Settlement(GameBoard& board, Coordinate location);
+	Settlement(GameBoard& board, Coordinate location, Player& owner);
 	Settlement(Settlement&) = delete;
 	~Settlement();
 	Settlement& operator=(Settlement&) = delete;

src/City.cpp

@@ -1,6 +1,6 @@
 #include "City.h"
 
-City::City(GameBoard& board, Coordinate location) : CornerPiece(board, location) {
+City::City(GameBoard& board, Coordinate location, Player& owner) : CornerPiece(board, location, owner) {
 
 }
 

src/CornerPiece.cpp

@@ -1,9 +1,17 @@
 #include "CornerPiece.h"
 
-CornerPiece::CornerPiece(GameBoard& board, Coordinate location) : GamePiece(board, location) {
+CornerPiece::CornerPiece(GameBoard& board, Coordinate location, Player& owner) : GamePiece(board, location), owner(owner) {
 
 }
 
 CornerPiece::~CornerPiece() {
 
-}
+}
+
+Player& CornerPiece::getOwner() {
+	return owner;
+}
+
+const Player& CornerPiece::getOwner() const {
+	return owner;
+}

src/GameBoard.cpp

@@ -158,6 +158,6 @@ void GameBoard::init_resources()
 }
 
 void GameBoard::PlaceSettlement(Coordinate location, Player& Owner){
-	corners[location] = std::unique_ptr<GamePiece>(new Settlement(*this, location));
+	corners[location] = std::unique_ptr<GamePiece>(new Settlement(*this, location, Owner));
 }
 

src/Settlement.cpp

@@ -1,6 +1,6 @@
 #include "Settlement.h"
 
-Settlement::Settlement(GameBoard& board, Coordinate location) : CornerPiece(board, location) {
+Settlement::Settlement(GameBoard& board, Coordinate location, Player& owner) : CornerPiece(board, location, owner) {
 
 }