Merge branch 'master' into serialization

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, Player& owner);
 	City(City&) = delete;
 	~City();
 	City& operator=(City&) = delete;

include/CornerPiece.h

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

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, Player& owner);
 	Settlement(Settlement&) = delete;
 	~Settlement();
 	Settlement& operator=(Settlement&) = delete;

src/City.cpp

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

src/CornerPiece.cpp

@@ -0,0 +1,17 @@
+#include "CornerPiece.h"
+
+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

@@ -128,33 +128,6 @@ void GameBoard::init_resources()
         }
     }
     #endif
-
-    /*
-    #ifdef DUMMY_BOARD
-	ADD_RESOURCE( 0, 1, BRICK, 2);
-	ADD_RESOURCE(-2, 2, SHEEP, 5);
-	ADD_RESOURCE(2, 0, WOOD, 6);
-	ADD_RESOURCE(-3, 4, DESERT, 0);
-	ADD_RESOURCE(-1, 3, SHEEP, 10);
-	ADD_RESOURCE( 1, 2, WHEAT, 9);
-	ADD_RESOURCE( 3, 1, WHEAT, 3);
-	ADD_RESOURCE(-4, 6, WOOD, 8);
-	ADD_RESOURCE(-2, 5, SHEEP, 3);
-	ADD_RESOURCE( 0, 4, STONE, 11);
-	ADD_RESOURCE( 2, 3, STONE, 4);
-	ADD_RESOURCE( 4, 2, SHEEP, 8);
-	ADD_RESOURCE(-3, 7, BRICK, 4);
-	ADD_RESOURCE(-1, 6, WHEAT, 6);
-	ADD_RESOURCE( 1, 5, WOOD, 5);
-	ADD_RESOURCE( 3, 4, BRICK, 10);
-	ADD_RESOURCE(-2, 8, WOOD, 11);
-	ADD_RESOURCE( 0, 7, STONE, 12);
-	ADD_RESOURCE( 2, 6, WHEAT, 9);
-	#endif
-    */
-	
-    
-
 }
 
 void GameBoard::PlaceSettlement(Coordinate location, Player& Owner){

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() {
-	
-}