Trading offers and counter offer windows implemented

Author: Databean

include/GameController.h

@@ -33,7 +33,7 @@ class GameController {
 	bool handleRoadButtonEvent(ScreenCoordinate);
 	bool handleSettlementButtonEvent(ScreenCoordinate);
 	bool handlePlayerClick(ScreenCoordinate, Player&);
-	bool handleTradeOffer(ScreenCoordinate, Player& initiating, std::array<int, 5>, Player& receiving);
+	bool handleTradeOffer(ScreenCoordinate, Player& initiating, std::array<int, 5>, Player& receiving, std::array<int, 5>);
 };
 
 #endif

include/GameView.h

@@ -184,17 +184,17 @@ class TradingView : public ViewElement {
 	Player& initiating;
 	Player& receiving;
 
-	std::array<int, 5> offer;
-	
 	ViewButtonText trade;
 	ViewButtonText cancel;
 
+	std::array<int, 5> offer;
+	
 	TradingView(TradingView& o) = delete;
 	TradingView& operator=(TradingView& o) = delete;
 protected:
 	virtual bool clicked(ScreenCoordinate coord);
 public:
-	TradingView(Player& initiating, Player& receiving, std::function<bool(std::array<int, 5>, ScreenCoordinate)> trade, std::function<bool(ScreenCoordinate)> cancel);
+	TradingView(Player& initiating, Player& receiving, std::function<bool(std::array<int, 5>, ScreenCoordinate)> trade, std::function<bool(ScreenCoordinate)> cancel, std::array<int, 5> offer);
 	virtual ~TradingView();
 
 	void render();

src/GameController.cpp

@@ -83,6 +83,14 @@ bool GameController::handleSettlementButtonEvent(ScreenCoordinate coord) {
 	return true;
 }
 
+template<int size>
+auto negativeArr(std::array<int, size> arr) -> std::array<int, size> {
+	for(auto& it : arr) {
+		it = -it;
+	}
+	return arr;
+}
+
 /**
  * Handles a click on one of the Player names at the top right of the screen.
  * @param coord The coordinate clicked on.
@@ -94,13 +102,21 @@ bool GameController::handlePlayerClick(ScreenCoordinate coord, Player& player) {
 	Player& receiving = player;
 	auto priority = -10;
 
-	std::function<bool(std::array<int, 5>, ScreenCoordinate)> tradeFunction(std::bind(&GameController::handleTradeOffer, this, _2, std::ref(initiating), _1, std::ref(receiving)));
+	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);
+		handleTradeOffer(coord, receiving, initial, receiving, reverseOffer);
+		return true;
+	});
 	std::function<bool(ScreenCoordinate)> cancelFunction([this, priority](ScreenCoordinate coord) {
 		view.removeElement(priority); 
 		return true;
 	});
 
-	view.addElement(priority, std::unique_ptr<ViewElement>(new TradingView(initiating, receiving, tradeFunction, cancelFunction)));
+	view.addElement(priority, std::unique_ptr<ViewElement>(new TradingView(initiating, receiving, tradeFunction, cancelFunction, initial)));
 	std::cout << player.getName() << std::endl;
 	return true;
 }
@@ -112,12 +128,25 @@ bool GameController::handlePlayerClick(ScreenCoordinate coord, Player& player) {
  * @param offer The offer the player is giving.
  * @param receiving The other player in the trade.
  */
-bool GameController::handleTradeOffer(ScreenCoordinate coord, Player& initiating, std::array<int, 5> offer, Player& receiving) {
-	std::cout << "Received trade offer of ";
-	for(auto& it : offer) {
-		std::cout << it << " ";
+bool GameController::handleTradeOffer(ScreenCoordinate coord, Player& initiating, std::array<int, 5> offer, Player& receiving, std::array<int, 5> counterOffer) {
+	auto priority = -10;
+	if(offer == negativeArr<5>(counterOffer)) {
+		view.removeElement(priority);
+		//TODO: perform trade
+	} 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) {
+			std::array<int, 5> reverseOffer = negativeArr<5>(offer);
+			handleTradeOffer(coord, receiving, counterOffer, receiving, reverseOffer);
+			return true;
+		});
+		std::function<bool(ScreenCoordinate)> cancelFunction([this, priority](ScreenCoordinate coord) {
+			view.removeElement(priority); 
+			return true;
+		});
+		
+		view.addElement(priority, std::unique_ptr<ViewElement>(new TradingView(initiating, receiving, tradeFunction, cancelFunction, counterOffer)));
 	}
-	std::cout << std::endl;
 	return true;
 }
 

src/GameView.cpp

@@ -494,13 +494,12 @@ void DrawingGameVisitor::visit(DevelopmentCard& card) {
 
 }
 
-TradingView::TradingView(Player& initiating, Player& receiving, std::function<bool(std::array<int, 5>, ScreenCoordinate)> trade, std::function<bool(ScreenCoordinate)> cancel) : ViewElement({{0.1, 0.1},{0.9, 0.9}}), initiating(initiating), receiving(receiving),
+TradingView::TradingView(Player& initiating, Player& receiving, std::function<bool(std::array<int, 5>, ScreenCoordinate)> trade, std::function<bool(ScreenCoordinate)> cancel, std::array<int, 5> initialOffer) : 
+	ViewElement({{0.1, 0.1},{0.9, 0.9}}), initiating(initiating), receiving(receiving),
 	trade(std::bind(trade, std::ref(offer), std::placeholders::_1), {{0.7, 0.1}, {0.9, 0.2}}, "resources/TypeWritersSubstitute-Black.ttf", 50, "Trade"),
-	cancel(cancel, {{0.1, 0.1}, {0.3, 0.2}}, "resources/TypeWritersSubstitute-Black.ttf", 50, "Cancel") {
+	cancel(cancel, {{0.1, 0.1}, {0.3, 0.2}}, "resources/TypeWritersSubstitute-Black.ttf", 50, "Cancel"),
+	offer(initialOffer) {
 
-	for(auto& res : offer) {
-		res = 0;
-	}
 }
 
 TradingView::~TradingView() {