Changed some Road methods to const, changed owner pointer to reference

Author: Databean

include/Road.h

@@ -12,10 +12,11 @@ class GameVisitor;
 
 class Road {
 private:
-	bool checkRoad();
-	
+	Player& owner;
 	Coordinate start;
 	Coordinate end;
+	
+	bool checkRoad();
 public:
 	Road(Coordinate start, Coordinate end, Player& Owner);
 	Road(Road&) = delete;
@@ -29,9 +30,7 @@ class Road {
 	bool equals(const Coordinate& otherStart, const Coordinate& otherEnd);
 
 	Player& getOwner();
-	Player& getOwner() const;
-
-	Player* owner;
+	const Player& getOwner() const;
 
 	virtual void accept(GameVisitor& visitor);
 	bool operator==(const Road&) const;

src/GameBoard.cpp

@@ -391,7 +391,7 @@ int GameBoard::FindLongestRoad_FromPoint(Coordinate curr, const Player & owner,
 		int temp_longest_path = length;
 
 		//if the owner is correct and the road is unmarked
-		if ( !markedRoads[road->get()] && (*road)->owner->getName() == owner.getName()){
+		if ( !markedRoads[road->get()] && (*road)->getOwner().getName() == owner.getName()){
 
 			temp_longest_path++;
 			markedRoads[road->get()] = true;

src/Road.cpp

@@ -2,22 +2,19 @@
 
 #include "GameVisitor.h"
 
-Road::Road(Coordinate start, Coordinate end, Player& Owner) {
+Road::Road(Coordinate start, Coordinate end, Player& Owner) : owner(Owner) {
 	if(start < end) {
 		this->start = start;
 		this->end = end;
 	} else {
 		this->end = start;
 		this->start = end;
 	}
-	owner = &Owner;
 
 	//If the input is bad, throw an exception so bad roads won't be built
 	if(!checkRoad()){
 		throw -1;
 	}
-
-
 }
 
 /**
@@ -42,7 +39,7 @@ void Road::accept(GameVisitor& visitor) {
 bool Road::operator==(const Road& other) const {
 	return getStart() == other.getStart() &&
 		getEnd() == other.getEnd() &&
-		owner->getName() == other.owner->getName();
+		owner.getName() == other.owner.getName();
 }
 
 /**
@@ -78,9 +75,9 @@ bool Road::equals(const Coordinate& otherStart, const Coordinate& otherEnd){
 }
 
 Player& Road::getOwner() {
-	return *owner;
+	return owner;
 }
 
-Player& Road::getOwner() const {
-	return *owner;
+const Player& Road::getOwner() const {
+	return owner;
 }