Actually does trades now

Author: Databean

include/Player.h

@@ -13,6 +13,7 @@
 #include <vector>
 #include <string>
 #include <memory>
+#include <array>
 
 #include "tinyxml2.h"
 
@@ -45,7 +46,7 @@ class Player {
     int tradeModifiers[5];
 
 
-    void tradeWithBank(int offer[], int demand[]);
+    void tradeWithBank(std::array<int, 5> offer, std::array<int, 5> demand);
 
 public:
 
@@ -78,11 +79,9 @@ class Player {
 
     void setGenralModifier();			//3:1 port
 
-    bool offerBankTrade(int offer[], int demand[]);
+    bool offerBankTrade(std::array<int, 5> offer, std::array<int, 5> demand);
 
-    bool offerTrade(Player* p, int offer[], int demand[]);
-    bool recieveOffer(Player* p, int offer[], int demand[]);
-    bool acceptOffer(Player* p, int offer[], int demand[]);
+    bool acceptOffer(Player& p, std::array<int, 5> offer, std::array<int, 5> demand);
 
     int getRandomResource();
 

src/GameController.cpp

@@ -132,7 +132,13 @@ bool GameController::handleTradeOffer(ScreenCoordinate coord, Player& initiating
 	auto priority = -10;
 	if(offer == negativeArr<5>(counterOffer)) {
 		view.removeElement(priority);
-		//TODO: perform trade
+		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];
+			splitDemand[i] = counterOffer[i] < 0 ? 0 : counterOffer[i];
+		}
+		initiating.acceptOffer(receiving, splitOffer, splitDemand);
 	} 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/Player.cpp

@@ -258,7 +258,7 @@ void Player::setGenralModifier()
  *@param offer An array representing your offer to the bank
  *@param demand An array representing your demand
  */
-void Player::tradeWithBank(int offer[], int demand[])
+void Player::tradeWithBank(std::array<int, 5> offer, std::array<int, 5> demand)
 {
 	for(int i=0; i<5; i++)
 	{
@@ -273,12 +273,12 @@ void Player::tradeWithBank(int offer[], int demand[])
  * @param demand An array representing your demand
  * @return true if bank accepted and trade was successful.
  */
-bool Player::offerBankTrade(int offer[], int demand[])
+bool Player::offerBankTrade(std::array<int, 5> offer, std::array<int, 5> demand)
 {
-	if(!checkResources(offer))
+	if(!checkResources(offer.data()))
 		return false;
 
-	int offerToBank[5];
+	std::array<int, 5> offerToBank;
 
 	for(int i=0; i<5; i++)
 	{
@@ -292,66 +292,23 @@ bool Player::offerBankTrade(int offer[], int demand[])
 }
 
 
-/**
- * Offer a trade to another player with an offer and a demand.
- * @param p The other player that is receiving the trade.
- * @param offer The resources this player is offering to the other player.
- * @param demand The resources that this player wants in return from the other player.
- * @return If the trade succeeded.
- */
-bool Player::offerTrade(Player* p, int offer[], int demand[])
-{
-	if(sizeof offer/sizeof(int) != 5 || sizeof demand/sizeof(int) != 5)
-		return false; //Invalid Trade
-
-	if(!this->checkResources(offer))
-		return false; //YOu dont have enough to offer this
-
-	return p->recieveOffer(this, offer, demand);
-}
-
-
-/**
- * Receive a trade offer from another player.
- * @param p The player offering the trade.
- * @param offer The resources the other player is giving.
- * @param demand The resources the other player wants in return.
- * @return If the trade succeeded.
- */
-bool Player::recieveOffer(Player* p, int offer[], int demand[])
-{
-	if( !this->checkResources(demand) )
-		return false;
-
-	bool input = true;
-
-	//TODO:Display Offer to User and wait for input
-
-	if(input)
-	{
-		this->acceptOffer(p, offer, demand);
-		return true;
-	}
-	else
-		return false;
-
-}
-
-
 /**
  * Accept the trade offer from another player.
  * @param p The player offering the trade.
  * @param offer The resources the other player is offering.
  * @param demand The resources the other player wants in return.
  */
 
-bool Player::acceptOffer(Player* p, int offer[], int demand[])
+bool Player::acceptOffer(Player& p, std::array<int, 5> offer, std::array<int, 5> demand)
 {
-	p->addWood(demand[WOOD_INDEX] - offer[WOOD_INDEX]);
-	p->addBrick(demand[BRICK_INDEX] - offer[BRICK_INDEX]);
-	p->addOre(demand[ORE_INDEX] - offer[ORE_INDEX]);
-	p->addWheat(demand[WHEAT_INDEX] - offer[WHEAT_INDEX]);
-	p->addWool(demand[WOOL_INDEX] - offer[WOOL_INDEX]);
+	if(!checkResources(offer.data()) || !p.checkResources(demand.data())) {
+		return false;
+	}
+	p.addWood(demand[WOOD_INDEX] - offer[WOOD_INDEX]);
+	p.addBrick(demand[BRICK_INDEX] - offer[BRICK_INDEX]);
+	p.addOre(demand[ORE_INDEX] - offer[ORE_INDEX]);
+	p.addWheat(demand[WHEAT_INDEX] - offer[WHEAT_INDEX]);
+	p.addWool(demand[WOOL_INDEX] - offer[WOOL_INDEX]);
 
 	this->addWood(offer[WOOD_INDEX] - demand[WOOD_INDEX]);
 	this->addBrick(offer[BRICK_INDEX] - demand[BRICK_INDEX]);