Merge branch 'master' into Paul

Author: PickledMonkey

Makefile

@@ -7,7 +7,7 @@ EXECUTABLE := warsofcatan
 ALLFILES := $(wildcard $(SRC_HOME)/*) $(wildcard $(INCL_HOME)/*)
 export CXX := g++
 export LD := g++
-export CXXFLAGS := -g -I$(INCL_HOME) -std=gnu++11
+export CXXFLAGS := -g -I$(INCL_HOME) -std=c++0x -Wall
 export LDFLAGS := -lSDL2 -lGL -lGLU
 
 .PHONY: all

include/City.h

@@ -0,0 +1,14 @@
+#ifndef CITY_H
+#define CITY_H
+
+class City public CornerPiece {
+private:
+
+public:
+	City();
+	City(City&) = delete;
+	~City();
+	City& operator=(City&) = delete;
+};
+
+#endif

include/CornerPiece.h

@@ -0,0 +1,14 @@
+#ifndef CORNERPIECE_H
+#define CORNERPIECE_H
+
+class CornerPiece {
+private:
+
+public:
+	CornerPiece();
+	CornerPiece(CornerPiece&) = delete;
+	~CornerPiece();
+	CornerPiece& operator=(CornerPiece&) = delete;
+};
+
+#endif

include/GameBoard.h

@@ -16,7 +16,8 @@
 
 class GameBoard {
 private:
-	std::map<Coordinate, std::unique_ptr<GamePiece>> pieces;
+	std::map<Coordinate, std::unique_ptr<GamePiece>> corners;
+	std::map<Coordinate, std::unique_ptr<GamePiece>> resources;
 	std::vector<std::unique_ptr<const Road>> roads;
 
 	int constructBoardFromFile(std::ifstream &file);
@@ -27,9 +28,16 @@ class GameBoard {
 	GameBoard(GameBoard&) = delete;
 	~GameBoard();
 	GameBoard& operator=(GameBoard&) = delete;
-
+	
 	int save_Board(std::string filename);
 	int load_Board(std::string filename);
+	const std::map<Coordinate, std::unique_ptr<GamePiece>>& getResources() const;
+	
+	std::vector<Settlement*> GetNeighboringSettlements(Coordinate location);
+
+	void PlaceSettlement(Coordinate location, Player& Owner);
+
+	void init_resources();
 };
 
 #endif

include/GamePiece.h

@@ -4,36 +4,52 @@
 #include "Util.h"
 #include "Player.h"
 
+enum resourceType { WHEAT, SHEEP, STONE, BRICK, WOOD, DESERT };
+
 class GameBoard;
 
 class GamePiece {
 private:
 	GameBoard& board;
 public:
-	GamePiece(GameBoard& board);
+	GamePiece(GameBoard& board, Coordinate location);
 	GamePiece(GamePiece&) = delete;
 	virtual ~GamePiece();
 	//virtual GamePiece& operator=(GamePiece&) = delete;
+	
+	Coordinate getCoordinates() const;
+	GameBoard& getBoard();
+	const GameBoard& getBoard() const;
+	
+	Coordinate location; 
 };
 
 class ResourceTile : public GamePiece {
-private:
-	
 public:
 	ResourceTile(GameBoard& board);
+	ResourceTile(GameBoard& board, Coordinate location, resourceType resource, int value);
 	ResourceTile(ResourceTile&) = delete;
-	virtual ~ResourceTile();
 	//virtual ResourceTile& operator=(ResourceTile&) = delete;
+
+	//dispense resource cards to owning players
+	void Payout();
+
+	resourceType resource;
+	int value;
+
+	virtual ~ResourceTile();
 };
 
 class Settlement : public GamePiece {
 private:
 	Player& owner;
 public:
-	Settlement(GameBoard& board, Player& owner);
+	Settlement(GameBoard& board, Coordinate location, Player& owner);
 	Settlement(Settlement&) = delete;
 	virtual ~Settlement();
 	//virtual Settlement& operator=(Settlement&) = delete;
+	
+	bool city;
 };
 
 class Road {

include/Player.h

@@ -1,14 +1,25 @@
 #ifndef PLAYER_H
 #define PLAYER_H
 
+#include <string>
+
+#include "Resources.h"
+
 class Player {
 private:
-	
+	std::string name;
+	Resources resources;
 public:
-	Player();
+	Player(const std::string& name);
 	Player(Player&) = delete;
 	~Player();
 	Player& operator=(Player&) = delete;
+	
+	const std::string& getName() const;
+	void setName(const std::string& newName);
+	
+	const Resources& getResources() const;
+	void setResources(const Resources& newResources);
 };
 
 #endif

include/Renderer.h

@@ -4,6 +4,6 @@
 #include "GameBoard.h"
 #include "Player.h"
 
-void renderBoard(GameBoard& board, Player& perspective);
+void renderBoard(const GameBoard& board, const Player& perspective);
 
 #endif

include/Resources.h

@@ -0,0 +1,45 @@
+#ifndef RESOURCES_H
+#define RESOURCES_H
+
+class Resources {
+public:
+	typedef unsigned short rtype;
+private:
+	rtype wood;
+	rtype sheep;
+	rtype grain;
+	rtype ore;
+	rtype brick;
+public:
+	Resources();
+	Resources(rtype wood, rtype sheep, rtype grain, rtype ore, rtype brick);
+	Resources(const Resources&);
+	~Resources();
+	Resources& operator=(const Resources&);
+	
+	rtype getWood() const;
+	void setWood(rtype newWood);
+	
+	rtype getSheep() const;
+	void setSheep(rtype newSheep);
+	
+	rtype getGrain() const;
+	void setGrain(rtype newGrain);
+	
+	rtype getOre() const;
+	void setOre(rtype newOre);
+	
+	rtype getBrick() const;
+	void setBrick(rtype newBrick);
+	
+	Resources operator+(const Resources&) const;
+	Resources& operator+=(const Resources&);
+	
+	Resources operator-(const Resources&) const;
+	Resources& operator-=(const Resources&);
+	
+	bool operator<(const Resources&) const;
+	bool operator>(const Resources&) const;
+};
+
+#endif

include/Road.h

@@ -0,0 +1,14 @@
+#ifndef ROAD_H
+#define ROAD_H
+
+class Road public CornerPiece {
+private:
+
+public:
+	Road();
+	Road(Road&) = delete;
+	~Road();
+	Road& operator=(Road&) = delete;
+};
+
+#endif

include/Settlement.h

@@ -0,0 +1,14 @@
+#ifndef SETTLEMENT_H
+#define SETTLEMENT_H
+
+class Settlement: public CornerPiece {
+private:
+
+public:
+	Settlement();
+	Settlement(Settlement&) = delete;
+	~Settlement();
+	Settlement& operator=(Settlement&) = delete;
+};
+
+#endif