Stuff compiles yay

PickledMonkey · PickledMonkey · commit be4e02e41329 · 2014-04-14T17:25:22.000-05:00
diff --git a/include/CornerPiece.h b/include/CornerPiece.h
@@ -16,13 +16,17 @@ class CornerPiece : public GamePiece {
 	CornerPiece(CornerPiece&) = delete;
 	~CornerPiece();
 	CornerPiece& operator=(CornerPiece&) = delete;
-	
+
 	Player& getOwner();
 	const Player& getOwner() const;
 
+	virtual void accept(GameVisitor& visitor)=0;
+
 	virtual int getResourceModifier();
 
 	virtual int getVictoryPoints();
+
+	virtual bool operator==(const GamePiece&) const;
 };
 
 #endif
diff --git a/include/GameBoard.h b/include/GameBoard.h
@@ -20,8 +20,6 @@
 
 class GameVisitor;
 
-class GameVisitor;
-
 /**
  * A game of Settlers of Catan, including resource tiles, settlements, cities, roads, and players.
  */
diff --git a/include/GameController.h b/include/GameController.h
@@ -50,18 +50,13 @@ class GameController {
 	void pushState(ControlState);
 	ControlState getState();
 	ControlState popState();
-bool handleTradeOffer(ScreenCoordinate, Player& initiating, std::array<int, 5>, Player& receiving, std::array<int, 5>);
 	void storeClick(Coordinate clickCoordinate);
 	Coordinate getLastClick();
 	Coordinate getPastClick(int howLongAgo);
 	void clearClickHistory();
 	bool hasClickHistory();
 	int getClickHistorySize();
 
-
-
-
-
 	bool handlePlayerClick(ScreenCoordinate, Player&);
 	bool handleTradeOffer(ScreenCoordinate, Player& initiating, std::array<int, 5>, Player& receiving, std::array<int, 5>);
 };
diff --git a/include/GameDice.h b/include/GameDice.h
@@ -2,9 +2,6 @@
 #define GAMEDICE_H
 
 
-
-
-
 class GameVisitor;
 
 class GameDice {
@@ -25,4 +22,4 @@ class GameDice {
 
 };
 
-#endif	
+#endif	
diff --git a/include/GameView.h b/include/GameView.h
@@ -64,6 +64,7 @@ class GameView {
 
 	void addPointOfInterest(ScreenCoordinate);
 	void clearPointsOfInterest();
+	void addElement(std::unique_ptr<ViewElement> element);
 	void addElement(int priority, std::unique_ptr<ViewElement>);
 	
 	std::unique_ptr<ViewElement> removeElement(int priority);
diff --git a/include/GameVisitor.h b/include/GameVisitor.h
@@ -8,6 +8,8 @@ class Road;
 class City;
 class Player;
 class DevelopmentCard;
+class GameDice;
+class Wonder;
 
 /**
  * A class to be extended with callbacks to handle the different classes in the model. 
@@ -28,6 +30,8 @@ class GameVisitor {
 	virtual void visit(Player&) = 0;
 	virtual void visit(ResourceTile&) = 0;
 	virtual void visit(DevelopmentCard&) = 0;
+	virtual void visit(GameDice&) = 0;
+	virtual void visit(Wonder&) = 0;
 };
 
-#endif
+#endif
diff --git a/include/Player.h b/include/Player.h
@@ -109,11 +109,9 @@ class Player {
     int getWoolModifier();
     void setWoolModifier();
 
-    void setGenralModifier();			//3:1 port
-
-    bool offerBankTrade(int offer[], int demand[]);
+    void setGeneralModifier();
 
-    void setGeneralModifier();			//3:1 port
+    void setGenralModifier();			//3:1 port
 
     bool offerBankTrade(std::array<int, 5> offer, std::array<int, 5> demand);
 
diff --git a/include/Serialization.h b/include/Serialization.h
@@ -31,10 +31,12 @@ class XMLVisitor : public GameVisitor {
 	virtual void visit(Player&);
 	virtual void visit(ResourceTile&);
 	virtual void visit(DevelopmentCard&);
+	virtual void visit(GameDice&);
+	virtual void visit(Wonder&);
 	
 	const tinyxml2::XMLDocument& getXMLDoc() const;
 };
 
 Coordinate xmlElementToCoord(const tinyxml2::XMLElement& element);
 
-#endif
+#endif
diff --git a/src/GameController.cpp b/src/GameController.cpp
@@ -136,7 +136,7 @@ bool GameController::handleBoardEvent(ScreenCoordinate screenCoord) {
 		storeClick(coord);
 		if(getClickHistorySize() >= 4){
 			using namespace std::placeholders;
-			view.addElement(makeConfirmationDialogue(
+			view.addElement(28, makeConfirmationDialogue(
 				std::bind(&GameController::handleConfirmRoadCard, this, _1),
 				std::bind(&GameController::handleCancelDialogueEvent, this, _1), {{.2, .3}, {.8, .6}}));
 			pushState(MODALSTATE);
@@ -216,12 +216,12 @@ bool GameController::handleRoadCardButtonEvent(ScreenCoordinate coord){
 
 bool GameController::handleConfirmRoadCard(ScreenCoordinate coord){
 	model.getCurrentPlayer().playRoadBuilding(getPastClick(3), getPastClick(2), getPastClick(1), getPastClick(0));
-	view.removeLastElement();
+	view.removeElement(28);
 	return handleCancelButtonEvent(coord);
 }
 
 bool GameController::handleCancelDialogueEvent(ScreenCoordinate coord){
-	view.removeLastElement();
+	view.removeElement(28);
 	return handleCancelButtonEvent(coord);
 }
 
diff --git a/src/GameView.cpp b/src/GameView.cpp
@@ -302,26 +302,6 @@ void ViewButtonText::render() {
 	glBindTexture(GL_TEXTURE_2D, 0);
 }
 
-/**
- * Removes the element pointed to so that it will no longer be rendered
- * @param a pointer to the element we want to remove
- */
-bool GameView::removeElement(ViewElement* element_sought){
-	for (std::vector<std::unique_ptr<ViewElement>>::iterator element = viewElements.begin() ; element != viewElements.end(); ++element)
-	{
-		if (element->get() == element_sought){
-			viewElements.erase(element);
-			return true;
-		}
-	}
-	return false;
-}
-
-bool GameView::removeLastElement(){
-	viewElements.pop_back();
-	return true;
-}
-
 void GameView::addPointOfInterest(ScreenCoordinate coord){
 	pointsOfInterest.push_back(coord);
 }
diff --git a/src/Player.cpp b/src/Player.cpp
@@ -38,6 +38,7 @@ Player::Player(GameBoard& board, std::string playerName) : name(playerName), boa
 	longestRoadSize = 0;
 	longestRoad = false;
 	victoryPoints = 0;
+	baseVictoryPoints = 0;
 	for(auto& r : resources) {
 		r = 0;
 	}
@@ -300,6 +301,17 @@ bool Player::buyCard(std::unique_ptr<DevelopmentCard>& card)
 	return false;
 }
 
+/**
+ * Sets the trade modifier for all resources to 3:1
+ */
+void Player::setGeneralModifier()
+{
+	for(int i =0; i<5; i++)
+	{
+		if(tradeModifiers[i] == 4)
+			tradeModifiers[i] = 3;
+	}
+}
 
 /**
  * Sets the trade modifier for Wood to 2:1
@@ -334,7 +346,13 @@ void Player::setWheatModifier()
 	tradeModifiers[WHEAT_INDEX] = 2;
 }
 
-
+/**
+ * Sets the trade modifier for Wool to 2:1
+ */
+void Player::setWoolModifier()
+{
+	tradeModifiers[WOOL_INDEX] = 2;
+}
 
 /**
  * Gets the current modifier for trading wood
@@ -345,29 +363,38 @@ int Player::getWoodModifier(){
 }
 
 /**
- * Sets the trade modifier for Wood to 2:1
+ * Gets the current modifier for trading brick
+ * @return int, the trading value for brick
  */
-void Player::setWoodModifier()
-{
-	tradeModifiers[WOOD_INDEX] = 2;
+int Player::getWheatModifier(){
+	return tradeModifiers[WHEAT_INDEX];
 }
 
 /**
  * Gets the current modifier for trading brick
  * @return int, the trading value for brick
  */
+int Player::getWoolModifier(){
+	return tradeModifiers[WOOL_INDEX];
+}
+
+/**
+ * Gets the current modifier for trading wood
+ * @return int, the trading value for wood
+ */
 int Player::getBrickModifier(){
 	return tradeModifiers[BRICK_INDEX];
 }
 
 /**
- * Sets the trade modifier for Wool to 2:1
+ * Gets the current modifier for trading brick
+ * @return int, the trading value for brick
  */
-void Player::setWoolModifier()
-{
-	tradeModifiers[WOOL_INDEX] = 2;
+int Player::getOreModifier(){
+	return tradeModifiers[ORE_INDEX];
 }
 
+
 /**
  * Sets the trade modifier for all resources to 3:1
  */
@@ -381,46 +408,6 @@ void Player::setGenralModifier()
 }
 
 
-/**
- *Performs a trade with bank according to the trade modifiers for each resource
- *@param offer An array representing your offer to the bank
- *@param demand An array representing your demand
- */
-void Player::tradeWithBank(int offer[], int demand[])
-{
-	for(int i=0; i<5; i++)
-	{
-		resources[i] -= offer[i]*tradeModifiers[i];
-		resources[i] += demand[i];
-	}
-	tradeModifiers[ORE_INDEX] = 2;
-}
-
-
-/**
- * Offer the bank a trade
- * @param offer An array representing your offer to the bank
- * @param demand An array representing your demand
- * @return true if bank accepted and trade was successful.
- */
-bool Player::offerBankTrade(int offer[], int demand[])
-{
-	if(!checkResources(offer))
-		return false;
-
-	int offerToBank[5];
-
-	for(int i=0; i<5; i++)
-	{
-		if(offer[i]%tradeModifiers[i] != 0)
-			return false;
-		offerToBank[i] = offer[i]/tradeModifiers[i];
-	}
-
-	this->tradeWithBank(offerToBank, demand);
-	return true;
-}
-
 bool Player::playVictoryCard(){
 	if(developmentCards[VICTORYPOINT] > 0){
 		developmentCards[VICTORYPOINT]--;
@@ -522,51 +509,6 @@ int Player::giveAllResources(int resourceType){
 }
 
 
-/**
- * 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.
diff --git a/tests/test_DevelopmentCards.cpp b/tests/test_DevelopmentCards.cpp
diff --git a/tests/test_Player.cpp b/tests/test_Player.cpp
diff --git a/tests/test_Roads.cpp b/tests/test_Roads.cpp
