Merge pull request #59 from Databean/fixedTrading

Fixed trading

Author: Kdog0073

src/GameController.cpp

@@ -490,10 +490,10 @@ bool GameController::handleTradeOffer(ScreenCoordinate coord, Player& initiating
 		std::array<int, 5> splitOffer;
 		std::array<int, 5> splitDemand;
 		for(int i = 0; i < 5; i++) {
-			splitOffer[i] = counterOffer[i] < 0 ? 0 : -counterOffer[i];
+			splitOffer[i] = counterOffer[i] > 0 ? 0 : -counterOffer[i];
 			splitDemand[i] = counterOffer[i] < 0 ? 0 : counterOffer[i];
 		}
-		initiating.acceptOffer(receiving, splitOffer, splitDemand);
+		initiating.acceptOffer(receiving, splitDemand, splitOffer);
 	} else {
 		//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, counterOffer](std::array<int, 5> offer, ScreenCoordinate coord) {

src/GameView.cpp

@@ -748,7 +748,7 @@ void TradingView::render() {
 	auto font = getGraphicsConfig()["font.path"];
 	auto fontSize = getGraphicsConfig()["font.size"];
 
-	std::string resources[] = {"Wood", "Brick", "Ore", "Wheat", "Wool"};
+	std::string resources[] = {"Wheat", "Wool", "Ore", "Brick", "Wood"};
 	for(int i = 0; i < 5; i++) {
 		auto leftX = getGraphicsConfig()["screen.tradingView.resources.leftX"];
 		auto rightX = getGraphicsConfig()["screen.tradingView.resources.rightX"];