Integrated new Settlement, Road, City, and CornerPiece classes

Author: Databean

include/City.h

@@ -1,11 +1,13 @@
 #ifndef CITY_H
 #define CITY_H
 
-class City public CornerPiece {
+#include "CornerPiece.h"
+
+class City : public CornerPiece {
 private:
 
 public:
-	City();
+	City(GameBoard& board, Coordinate location);
 	City(City&) = delete;
 	~City();
 	City& operator=(City&) = delete;

include/CornerPiece.h

@@ -1,11 +1,13 @@
 #ifndef CORNERPIECE_H
 #define CORNERPIECE_H
 
-class CornerPiece {
+#include "GamePiece.h"
+
+class CornerPiece : public GamePiece {
 private:
 
 public:
-	CornerPiece();
+	CornerPiece(GameBoard& board, Coordinate location);
 	CornerPiece(CornerPiece&) = delete;
 	~CornerPiece();
 	CornerPiece& operator=(CornerPiece&) = delete;

include/GameBoard.h

@@ -12,7 +12,9 @@
 
 #include "Util.h"
 #include "GamePiece.h"
+#include "Settlement.h"
 #include "tinyxml2.h"
+#include "Road.h"
 
 class GameBoard {
 private:

include/GamePiece.h

@@ -40,30 +40,5 @@ class ResourceTile : public GamePiece {
 	virtual ~ResourceTile();
 };
 
-class Settlement : public GamePiece {
-private:
-	Player& owner;
-public:
-	Settlement(GameBoard& board, Coordinate location, Player& owner);
-	Settlement(Settlement&) = delete;
-	virtual ~Settlement();
-	//virtual Settlement& operator=(Settlement&) = delete;
-	
-	bool city;
-};
-
-class Road {
-private:
-	GameBoard& board;
-	Player& owner;
-	Coordinate start;
-	Coordinate end;
-public:
-	Road(GameBoard& board, Player& owner, Coordinate start, Coordinate end);
-	Road(Road&);
-	~Road();
-	//Road& operator=(Road&) = delete;
-};
-
 #endif
 

include/Road.h

@@ -1,11 +1,14 @@
 #ifndef ROAD_H
 #define ROAD_H
 
-class Road public CornerPiece {
-private:
+#include "Util.h"
 
+class Road {
+private:
+	Coordinate start;
+	Coordinate end;
 public:
-	Road();
+	Road(Coordinate start, Coordinate end);
 	Road(Road&) = delete;
 	~Road();
 	Road& operator=(Road&) = delete;

include/Settlement.h

@@ -1,11 +1,13 @@
 #ifndef SETTLEMENT_H
 #define SETTLEMENT_H
 
-class Settlement: public CornerPiece {
+#include "CornerPiece.h"
+
+class Settlement : public CornerPiece {
 private:
 
 public:
-	Settlement();
+	Settlement(GameBoard& board, Coordinate location);
 	Settlement(Settlement&) = delete;
 	~Settlement();
 	Settlement& operator=(Settlement&) = delete;

src/City.cpp

@@ -0,0 +1,9 @@
+#include "City.h"
+
+City::City(GameBoard& board, Coordinate location) : CornerPiece(board, location) {
+	
+}
+
+City::~City() {
+	
+}

src/CornerPiece.cpp

@@ -0,0 +1,9 @@
+#include "CornerPiece.h"
+
+CornerPiece::CornerPiece(GameBoard& board, Coordinate location) : GamePiece(board, location) {
+	
+}
+
+CornerPiece::~CornerPiece() {
+	
+}

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, Owner));
+	corners[location] = std::unique_ptr<GamePiece>(new Settlement(*this, location));
 }
 

src/GamePiece.cpp

@@ -41,24 +41,3 @@ void ResourceTile::Payout() {
 	}
 }
 */
-
-Settlement::Settlement(GameBoard& board, Coordinate location, Player& owner) : 
-GamePiece(board, location), owner(owner), city(0) {
-	
-}
-
-Settlement::~Settlement() {
-	
-}
-
-Road::Road(GameBoard& board, Player& owner, Coordinate start, Coordinate end) : board(board), owner(owner), start(start), end(end) {
-	
-}
-
-Road::Road(Road& other) : board(other.board), owner(other.owner), start(other.start), end(other.end) {
-	
-}
-
-Road::~Road() {
-	
-}