Merge pull request #65 from Databean/fixTradingAgain

Fixed trading again

Author: Kdog0073

src/GameController.cpp

@@ -472,13 +472,12 @@ auto negativeArr(std::array<int, size> arr) -> std::array<int, size> {
 bool GameController::handlePlayerClick(ScreenCoordinate coord, Player& player) {
 	if(getState() == BASESTATE){
 		using namespace std::placeholders;
-		Player& initiating = *model.getPlayers()[0];
+		Player& initiating = model.getCurrentPlayer();
 		Player& receiving = player;
 		auto priority = -10;
 
 		std::array<int, 5> initial{{0, 0, 0, 0, 0}};
-
-		//std::function<bool(std::array<int, 5>, ScreenCoordinate)> tradeFunction(std::bind(&GameController::handleTradeOffer, this, _2, std::ref(initiating), _1, std::ref(receiving)));
+		
 		std::function<bool(std::array<int, 5>, ScreenCoordinate)> tradeFunction([this, &initiating, &receiving](std::array<int, 5> offer, ScreenCoordinate coord) {
 			std::array<int, 5> initial{{0, 0, 0, 0, 0}};
 			std::array<int, 5> reverseOffer = negativeArr<5>(offer);

src/Player.cpp

@@ -606,7 +606,13 @@ int Player::giveAllResources(int resourceType){
 
 bool Player::acceptOffer(Player& p, std::array<int, 5> offer, std::array<int, 5> demand)
 {
-	if(!checkResources(offer.data()) || !p.checkResources(demand.data())) {
+	std::cout << getName() << "\t" << p.getName() << std::endl;
+	for(int i = 0; i < 5; i++) {
+		std::cout << offer[i] << " " << demand[i] << std::endl;
+	}
+	if(!checkResources(demand.data()) || !p.checkResources(offer.data())) {
+		std::cout << "failed" << std::endl;
+		std::cout << checkResources(offer.data()) << " " << p.checkResources(demand.data()) << std::endl;
 		return false;
 	}
 	p.addWood(demand[WOOD_INDEX] - offer[WOOD_INDEX]);