Merge pull request #69 from Databean/road_refactoring

Road refactoring

Author: Databean

include/GameBoard.h

@@ -21,7 +21,6 @@
 
 #include "DevelopmentCard.h"
 
-
 class GameVisitor;
 
 /**
@@ -37,7 +36,7 @@ class GameBoard {
 
 	Deck deck;
 
-	std::map<Coordinate, std::vector<std::shared_ptr<Road>>> roads;
+	std::map<Coordinate, std::vector<std::shared_ptr<Road>>>roads;
 
 	std::vector<std::unique_ptr<Player>> players;
 	Coordinate robber;
@@ -46,12 +45,11 @@ class GameBoard {
 	int maxVictoryPoints;
 	int winner;
 
-    void addResource(int x, int y, resourceType res, int val);
-    bool checkRolls(int* rolls);
+	void addResource(int x, int y, resourceType res, int val);
+	bool checkRolls(int* rolls);
 
 	bool isValidBoard() const;
 
-
 	bool outOfBounds(const Coordinate& coord) const;
 	bool roadExists(Coordinate start, Coordinate end) const;
 	bool isRoadConnectionPoint(Coordinate point, Player& Owner) const;
@@ -64,11 +62,11 @@ class GameBoard {
 
 	void createRing(Coordinate topRight, int sideLength, std::vector<resourceType>& resources, std::vector<int>& rolls);
 	void insertTile(Coordinate location, std::vector<resourceType>& resources, std::vector<int>& rolls);
-    
-    std::pair<int, int> startTurn();
-    void enableRobber();
-    void payoutResources(int roll);
-    
+
+	std::pair<int, int> startTurn();
+	void enableRobber();
+	void payoutResources(int roll);
+
 public:
 	GameBoard(const std::vector<std::string>& playerNames);
 	GameBoard(const std::vector<std::string>& playerNames, const std::map<Coordinate, std::pair<resourceType, int>>& resourceLocations);
@@ -112,16 +110,16 @@ class GameBoard {
 	void PlaceSettlement(Coordinate location, Player& Owner);
 	void UpgradeSettlement(Coordinate location);
 	void UpgradeToWonder(Coordinate location);
-	
+
 	bool verifyRoadPlacement(Coordinate start, Coordinate end, Player& Owner) const;
 	bool buyRoad(Coordinate start, Coordinate end, Player& Owner);
-	
+
 	bool canPlaceSettlement(const Coordinate& location, const Player& owner);
 	bool buySettlement(const Coordinate& location, Player& owner);
-	
+
 	bool canUpgradeSettlement(Coordinate location, const Player& owner) const;
 	bool buyUpgradeOnSettlement(Coordinate location, Player& owner);
-	
+
 	bool canUpgradeToWonder(Coordinate location, const Player& owner) const;
 	bool buyUpgradeOnWonder(Coordinate location, Player& owner);
 
@@ -136,15 +134,15 @@ class GameBoard {
 	bool operator==(const GameBoard& other) const;
 
 	const std::vector<std::unique_ptr<Player>>& getPlayers() const;
-	
+
 	int getNoOfPlayers();
 	Player& getPlayer(int index);
 
-    bool testRollChecking(int* rolls);
+	bool testRollChecking(int* rolls);
 
-    bool moveRobber(Coordinate newRobber);
-    Coordinate getRobber() const;
-    bool canRobberRob(Player& opponent, Coordinate location);
+	bool moveRobber(Coordinate newRobber);
+	Coordinate getRobber() const;
+	bool canRobberRob(Player& opponent, Coordinate location);
 
 };
 

include/Road.h

@@ -19,7 +19,7 @@ class Road {
 	Player& owner;
 	Coordinate start;
 	Coordinate end;
-	
+
 	bool checkRoad();
 public:
 
@@ -33,14 +33,13 @@ class Road {
 	Coordinate getStart() const;
 	Coordinate getEnd() const;
 
-	bool equals(const Road& otherRoad);
-	bool equals(const Coordinate& otherStart, const Coordinate& otherEnd);
-	
+	bool operator==(const Road&) const;
+	bool equals(const Road& otherRoad) const;
+	bool equals(const Coordinate& otherStart, const Coordinate& otherEnd) const;
+
 	Player& getOwner();
-	const Player& getOwner() const;
-	
+
 	virtual void accept(GameVisitor& visitor);
-	bool operator==(const Road&) const;
 };
 
 #endif