did some stuff with payout that we'll overwrite

Author: apolitakis

include/GameBoard.h

@@ -75,6 +75,8 @@ class GameBoard {
 
 	void initializeGame();
 
+	GameDice getDice();
+
 	void save(std::ostream& out);
 
 	ResourceTile& getResourceTile(Coordinate location) const;

src/GameBoard.cpp

@@ -131,6 +131,9 @@ GameBoard::GameBoard(const std::vector<std::string>& playerNames, const std::map
 	currentTurn = 0;
 }
 
+GameDice GameBoard::getDice() {
+	return dice;
+}
 /**
  * Construct a board by reading in an XML representation from a stream.
  * @param in The stream to read from.

src/GameController.cpp

@@ -143,6 +143,9 @@ void printPlayerInfo(const Player& player) {
  */
 bool GameController::nextTurn(ScreenCoordinate) {
 	model.endTurn();
+	if (model.getDice().getFirst() + model.getDice().getSecond() == 7)
+		pushState(ROBBER);
+
 	printPlayerInfo(model.getCurrentPlayer());
 	return true;
 }

src/GamePiece.cpp

@@ -116,12 +116,22 @@ void ResourceTile::Payout() const{
 	if (getBoard().getRobber() == location) //no need to pay out
 		return;
 
-	std::vector<CornerPiece*> neighbors = getBoard().GetNeighboringCorners(location);
-	std::vector<CornerPiece*>::iterator it = neighbors.begin();
+	//std::vector<CornerPiece*> neighbors = getBoard().GetNeighboringCorners(location);
+	//std::vector<CornerPiece*>::iterator it = neighbors.begin();
+
+	std::vector<Settlement*> neighbors = getBoard().GetNeighboringSettlements(location);
+	std::vector<Settlement*>::iterator it = neighbors.begin();
 	while (it != neighbors.end())
 	{
 		(*it)->getOwner().addResource(resource, (*it)->getResourceModifier());
+		std::cout << ((*it)->getOwner().getWood()) << "\n";
+		std::cout << ((*it)->getOwner().getBrick()) << "\n";
+		std::cout << ((*it)->getOwner().getOre()) << "\n";
+		std::cout << ((*it)->getOwner().getWheat()) << "\n";
+		std::cout << ((*it)->getOwner().getWool()) << "\n";
+
 		it++;
 	}
+
 }