Merged changes

Author: Databean

.gitignore

@@ -19,3 +19,6 @@ warsofcatan
 *.test
 /Default
 *.wocs
+
+documentation/*
+/Debug

.travis.yml

@@ -2,5 +2,5 @@ language: cpp
 before_install: 
  - sudo add-apt-repository ppa:antumdeluge/sdl2 -y
  - sudo apt-get update -y
- - sudo apt-get install libsdl2 libsdl2-dev -y
+ - sudo apt-get install libsdl2 libsdl2-dev libsdl2-ttf libsdl2-ttf-dev -y
 script: make tests

Doxyfile

@@ -8,7 +8,7 @@ ALLFILES := $(wildcard $(SRC_HOME)/*) $(wildcard $(INCL_HOME)/*)
 export CXX := g++
 export LD := g++
 export CXXFLAGS := -g -I$(INCL_HOME) -std=c++0x -Wall
-export LDFLAGS := -L/usr/local/lib -lSDL2 -lGL -lGLU
+export LDFLAGS := -L/usr/local/lib -lSDL2 -lSDL2_ttf -lGL -lGLU
 
 .PHONY: all
 all: $(EXECUTABLE)

Makefile

@@ -7,20 +7,20 @@
  * Upgraded from a Settlement. Exists on the board, and receives two resources from adjacent tiles when their number is rolled.
  */
 class City : public CornerPiece {
-private:
+	private:
 
-public:
-	City(GameBoard& board, Coordinate location, Player& owner);
-	City(City&) = delete;
-	~City();
-	City(CornerPiece& sett);
-	City& operator=(City&) = delete;
-	
-	virtual void accept(GameVisitor&);
-	virtual bool operator==(const GamePiece& piece) const;
+	public:
+		City(GameBoard& board, Coordinate location, Player& owner);
+		City(City&) = delete;
+		~City();
+		City(CornerPiece& sett);
+		City& operator=(City&) = delete;
 
-	int getResourceModifier();
-	int getVictoryPoints();
+		virtual void accept(GameVisitor&);
+		virtual bool operator==(const GamePiece& piece) const;
+	
+		int getResourceModifier();
+		int getVictoryPoints();
 };
 
 #endif

include/City.h

@@ -20,9 +20,13 @@ class CornerPiece : public GamePiece {
 	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

include/CornerPiece.h

@@ -27,7 +27,7 @@ class Deck {
     void reshuffleDeck();
 
 public:
-	Deck();
+	Deck(GameBoard& board);
 	virtual ~Deck();
 
 	int getSize();

include/Deck.h

@@ -20,93 +20,82 @@
 enum DevCardType { KNIGHT, VICTORYPOINT, YEAROFPLENTY, MONOPOLY, ROADBUILDING };
 
 
-/**
- * A card which can be held in a player's hand and be used to perform an action.
- */
+
 class DevelopmentCard {
 
-private:
-    Player* owner;
+protected:
     DevCardType type;
+    GameBoard& board;
 public:
-    DevelopmentCard(Player* player);
+    DevelopmentCard(GameBoard& board);
     virtual ~DevelopmentCard();
 
     virtual DevCardType getType() const = 0;
-    virtual void playCard() = 0;
 
-    virtual Player* getOwner();
 	virtual void accept(GameVisitor& visitor);
 	virtual bool operator==(const DevelopmentCard&);
 };
 
-/**
- * A development card used to move the robber and take a resource from another player.
- */
+
+
 class KnightCard : public DevelopmentCard {
 private:
 
 public:
-	KnightCard(Player* player);
+	KnightCard(GameBoard& board);
 //	virtual ~KnightCard();
 
     virtual DevCardType getType() const;
-    virtual void playCard();
+    void playCard(Player *player, Coordinate target);
 
 };
 
-/**
- * A development card that gives a permanent victory point on usage.
- */
+
+
 class VictoryPointCard : public DevelopmentCard {
 public:
-    VictoryPointCard(Player* player);
+    VictoryPointCard(GameBoard& board);
 //    virtual ~VictoryPointCard();
 
     virtual DevCardType getType() const;
-    virtual void playCard();
 
 };
 
-/**
- * A development card used to retrieve two resources of any type from the bank.
- */
+
 class YearOfPlentyCard : public DevelopmentCard {
 public:
-    YearOfPlentyCard(Player* player);
+    YearOfPlentyCard(GameBoard& board);
 //    virtual ~YearOfPlentyCard();
 
     virtual DevCardType getType() const;
-    virtual void playCard();
+    void playCard(Player *player, int rType1, int rType2);
 
 };
 
-/**
- * A development card used to take all resources of a particular type from all players.
- */
+
+
+
 class MonopolyCard : public DevelopmentCard {
 public:
-    MonopolyCard(Player* player);
+    MonopolyCard(GameBoard& board);
 //    virtual ~MonopolyCard();
 
     virtual DevCardType getType() const;
-    virtual void playCard();
+    void playCard(Player *player, int rType);
 
 };
 
-/**
- * A development card used to build two roads at no cost.
- */
+
+
 class RoadBuildingCard : public DevelopmentCard {
 private:
 
 public:
-	RoadBuildingCard(Player* player);
+	RoadBuildingCard(GameBoard& board);
 //	virtual ~RoadBuildingCard();
 
     virtual DevCardType getType() const;
-    virtual void playCard();
-    void playCard(Coordinate start1, Coordinate end1, Coordinate start2, Coordinate end2);
+    void playCard(Player* player, Coordinate start1, Coordinate end1, Coordinate start2, Coordinate end2);
 };
 
 

include/DevelopmentCard.h

@@ -38,12 +38,12 @@ class GameBoard {
 	std::vector<std::unique_ptr<Player>> players;
 	Coordinate robber;
 
-	
+
     void addResource(int x, int y, resourceType res, int val);
     bool checkRolls(int* rolls);
-	
+
 	bool isValidBoard() const;
-	
+
 
 	bool verifyRoadPlacement(Coordinate start, Coordinate end, Player& Owner) const;
 	bool outOfBounds(const Coordinate& coord) const;
@@ -55,7 +55,7 @@ class GameBoard {
 
 	void removeRoadEnd(std::shared_ptr<Road> startRoad);
 	int FindLongestRoad_FromPoint(Coordinate curr, const Player & owner, std::map<Coordinate, bool>& marked, std::map<Road*, bool>& markedRoads, int length) const;
-	
+
 	void createRing(Coordinate topRight, int sideLength, std::vector<resourceType>& resources, std::vector<int>& rolls);
 	void insertTile(Coordinate location, std::vector<resourceType>& resources, std::vector<int>& rolls);
 
@@ -64,15 +64,15 @@ class GameBoard {
     void payoutResources(int roll);
 
 public:
-	GameBoard(std::vector<std::unique_ptr<Player>>&& players);
-	GameBoard(std::vector<std::unique_ptr<Player>>&& players, const std::map<Coordinate, std::pair<resourceType, int>>& resourceLocations);
+	GameBoard(const std::vector<std::string>& playerNames);
+	GameBoard(const std::vector<std::string>& playerNames, const std::map<Coordinate, std::pair<resourceType, int>>& resourceLocations);
 	GameBoard(std::istream& in);
 	GameBoard(GameBoard&) = delete;
 	~GameBoard();
 	GameBoard& operator=(GameBoard&) = delete;
-	
+
 	void save(std::ostream& out);
-	
+
 	ResourceTile& getResourceTile(Coordinate location) const;
 
 	const std::map<Coordinate, std::unique_ptr<ResourceTile>>& getResources() const;
@@ -81,7 +81,7 @@ class GameBoard {
 
 	const std::shared_ptr<Road> getRoad(Coordinate start, Coordinate end) const;
 	const std::vector<std::shared_ptr<Road>>& getRoads(Coordinate loc) const;
-	
+
 	int FindLongestRoad(const Player & owner) const;
 
 	std::vector<Settlement*> GetNeighboringSettlements(Coordinate location) const;
@@ -91,21 +91,25 @@ class GameBoard {
 
 	void PlaceSettlement(Coordinate location, Player& Owner);
 	void UpgradeSettlement(Coordinate location);
-	//void PlaceRoad(Coordinate start, Coordinate end, Player& Owner);
+	void UpgradeToWonder(Coordinate location);
 
 
 	bool buyRoad(Coordinate start, Coordinate end, Player& Owner);
 
 	//void PlaceSettlement(Coordinate location, Player& Owner);
 	void PlaceCity(Coordinate location, Player& Owner);
+	void PlaceWonder(Coordinate location, Player& Owner);
 	bool PlaceRoad(Coordinate start, Coordinate end, Player& Owner);
-	
+
 	void accept(GameVisitor& visitor);
-	
+
 	bool operator==(const GameBoard& other) const;
-	
+
 	const std::vector<std::unique_ptr<Player>>& getPlayers() const;
-    
+	
+	int getNoOfPlayers();
+	Player& getPlayer(int index);
+
     bool testRollChecking(int* rolls);
 
     void moveRobber(Coordinate newRobber);

include/GameBoard.h

@@ -80,6 +80,7 @@ class DrawingGameVisitor : public GameVisitor {
 	virtual void visit(ResourceTile&);
 	virtual void visit(DevelopmentCard&);
 	virtual void visit(GameDice&);
+	virtual void visit(Wonder&);
 };
 
 /**
@@ -156,4 +157,4 @@ std::unique_ptr<ViewElement> makeViewButtonColor(Fn fn, std::pair<ScreenCoordina
 	return std::unique_ptr<ViewElement>(new ViewButtonColor<Fn>(fn, rect, color));
 }
 
-#endif
+#endif