Merge pull request #56 from Databean/robber_finishing

Robber finishing

Author: PickledMonkey

src/GameBoard.cpp

@@ -65,7 +65,15 @@ GameBoard::GameBoard(const vector<std::string>& playerNames) {
 		}
 		valid = isValidBoard();
 	}
-	moveRobber(Coordinate(0,4));
+	//moveRobber(Coordinate(0,4));
+	auto it = getResources().begin();
+	while(it != getResources().end()) {
+		if ((it->second)->getType() == DESERT)
+			moveRobber(it->first);
+		it++;
+	}
+	std::cout << getRobber().first << "\n";
+	std::cout << getRobber().second << "\n";
 
 }
 

src/GameView.cpp

@@ -574,7 +574,6 @@ void DrawingGameVisitor::visit(GameDice& dice) {
 
 	static const GLuint diceTextures = loadImageAsTexture("resources/catan_dice_new.bmp");
 
-	
 	glBindTexture(GL_TEXTURE_2D, diceTextures);
 
 	glColor3d(1.0, 1.0, 1.0);	
@@ -657,7 +656,8 @@ void DrawingGameVisitor::visit(ResourceTile& tile) {
 	vertexPair(Coordinate(coord.first + adjacentCoordDiffs[0].first, coord.second + adjacentCoordDiffs[0].second));
 	glEnd();
 
-	if(tile.getDiceValue() != 0) {
+	if(tile.getDiceValue() != 0 || 
+		tile.getBoard().getResourceTile(tile.getBoard().getRobber()).getType() == DESERT) {
 		if (tile.getBoard().getRobber() == coord) { //draw the robber on this tile
 
 			drawTexturedCircle(make_pair(1240.f, 643.f), 59.5f, coordToScreen(coord), 0.04);