merged into master to resolve conflicts

Author: apolitakis

include/GameBoard.h

@@ -137,7 +137,7 @@ class GameBoard {
 
     bool testRollChecking(int* rolls);
 
-    void moveRobber(Coordinate newRobber);
+    bool moveRobber(Coordinate newRobber);
     Coordinate getRobber() const;
     bool canRobberRob(Player& opponent, Coordinate location);
 

include/GameController.h

@@ -47,6 +47,12 @@ class GameController {
 	bool handleMonopolyCardButtonEvent(ScreenCoordinate);
 	bool handleVictoryPointCardButtonEvent(ScreenCoordinate);
 
+	bool handleWoodButtonEvent(ScreenCoordinate);
+	bool handleSheepButtonEvent(ScreenCoordinate);
+	bool handleWheatButtonEvent(ScreenCoordinate);
+	bool handleOreButtonEvent(ScreenCoordinate);
+	bool handleBrickButtonEvent(ScreenCoordinate);
+
 	bool handleCancelButtonEvent(ScreenCoordinate);
 
 	bool handleConfirmRoadCard(ScreenCoordinate);

include/GameView.h

@@ -55,6 +55,8 @@ class GameView {
 	void drawCardCount(std::string font, int fontSize);
 	void drawResourceCount(std::string font, int fontSize);
 
+	std::string controlStateText;
+
 	GameView(const GameView& o) = delete;
 	GameView& operator=(const GameView& o) = delete;
 public:
@@ -64,6 +66,8 @@ class GameView {
 	void render();
 	bool acceptInput(SDL_Event& event);
 
+	void setControlStateText(std::string newText);
+
 
 	void addPointOfInterest(ScreenCoordinate);
 	void clearPointsOfInterest();

src/GameBoard.cpp

@@ -108,8 +108,6 @@ void GameBoard::createRing(Coordinate topRight, int sideLength, vector<resourceT
 void GameBoard::insertTile(Coordinate location, vector<resourceType>& resources, vector<int>& rolls) {
 	if(rolls.back() == 0) {
 		addResource(location.first, location.second, DESERT, rolls.back());
-		//moveRobber(Coordinate(location.first, location.second));
-		//std::cout << location.first << location.second << "\n";
 		rolls.pop_back();
 	} else {
 		addResource(location.first, location.second, resources.back(), rolls.back());
@@ -414,16 +412,15 @@ std::vector<Settlement*> GameBoard::GetNeighboringSettlements(
  * @param location The location to search the neighbors of.
  * @return A vector of the corner pieces in the vicinity.
  */
-std::vector<CornerPiece*> GameBoard::GetNeighboringCorners(
-		Coordinate location) const{
-	static Coordinate adjacentCoordDiffs[] = { Coordinate(0, 1), Coordinate(1,
-			0), Coordinate(1, -1), Coordinate(0, -1), Coordinate(-1, 0),
-			Coordinate(-1, 1) };
+std::vector<CornerPiece*> GameBoard::GetNeighboringCorners(Coordinate location) const{
+	static Coordinate adjacentCoordDiffs[] = { Coordinate(0, 1), Coordinate(1,0),
+			Coordinate(1, -1), Coordinate(0, -1), Coordinate(-1, 0), Coordinate(-1, 1) };
+
 	std::vector<CornerPiece*> v;
 	for (unsigned int i = 0; i < 6; i++) {
 		const Coordinate& diff = adjacentCoordDiffs[i];
-		Coordinate adjacentPoint(location.first + diff.first,
-				location.second + diff.second);
+		Coordinate adjacentPoint(location.first + diff.first, location.second + diff.second);
+
 		auto it = corners.find(adjacentPoint);
 		if (it != corners.end()) {
 			GamePiece* piece = it->second.get();
@@ -531,21 +528,22 @@ bool GameBoard::verifyRoadPlacement(Coordinate start, Coordinate end, Player& Ow
  * Move the robber to a new coordinate on the board.
  * @param newRobber The coordinate to move the robber to.
  */
-void GameBoard::moveRobber(Coordinate newRobber) {
+bool GameBoard::moveRobber(Coordinate newRobber) {
 
 	//Bounds check
-	if(resources.count(newRobber) > 0)
+	if(resources.find(newRobber) != resources.end()){
 		robber = newRobber;
+		return true;
+	}
+	return false;
 }
 
 /**
- * DOES NOT WORK BECAUSE getNeighboringCorners() does not work
+ * Returns whether the robber can rob the Player opponent at the recourse tile Coordinate location
+ * @return true if the robber can rob the opponent, false otherwise
  */
 bool GameBoard::canRobberRob(Player& opponent, Coordinate location){
-	std::cout << GetNeighboringCorners(location).size() << "\n";
-
 	for(auto corner : GetNeighboringCorners(location)){
-		std::cout << corner->getOwner().getName() << "derp\n";
 		if(corner->getOwner() == opponent){
 			return true;
 		}