Merge branch 'master' of https://github.com/Databean/warsofcatan

Author: apolitakis

include/GameDice.h

@@ -1,25 +1,20 @@
 #ifndef GAMEDICE_H
 #define GAMEDICE_H
 
-
 class GameVisitor;
 
+/**
+ * The two dice used to determine the tiles that give resources.
+ */
 class GameDice {
-	private:
-		int first;
-		int second;
-		
-		
-	public:
-		int getFirst();
-		int getSecond();
-		bool shown;
-		void setFirst(int newFirst);
-		void setSecond(int newSecond);
-		virtual void accept(GameVisitor& visitor);
-
-
-
+private:
+	int first;
+	int second;
+public:
+	int roll();
+	int getFirst() const;
+	int getSecond() const;
+	virtual void accept(GameVisitor& visitor);
 };
 
 #endif	

resources/ComicNeue-Bold.ttf

@@ -940,21 +940,15 @@ Player& GameBoard::getPlayer(int index)
  *  When a player begins their turn, this rolls the dice and takes the required action (paying resources or enabling robber movement)
  *  @return A pair of the values of the dice.
  */
-std::pair<int, int> GameBoard::startTurn()
-{
-    int die1 = std::rand() % 6 + 1;
-    int die2 = std::rand() % 6 + 1;
-    int roll = die1+die2;
-
-    dice.setFirst(die1);
-    dice.setSecond(die2);
-    if (roll==7)
-        enableRobber();
-    
-    else
-        payoutResources(roll);
-    
-    return std::make_pair(die1, die2);
+std::pair<int, int> GameBoard::startTurn() {
+	int roll = dice.roll();
+	if (roll==7) {
+		enableRobber();
+	} else {
+		payoutResources(roll);
+	}
+	
+	return std::make_pair(dice.getFirst(), dice.getSecond());
 }
 
 /**

resources/TypeWritersSubstitute-Black.ttf

@@ -23,7 +23,7 @@ GameController::GameController(GameBoard& model, GameView& view) : model(model),
 	view.addElement(makeViewButtonColor(std::bind(&GameController::handleRoadButtonEvent, this, _1), {{0, 0}, {0.1, 0.1}}, std::make_tuple(1.f, 0.f, 0.f)));
 	view.addElement(makeViewButtonColor(std::bind(&GameController::handleSettlementButtonEvent, this, _1), {{0, 0.1}, {0.1, 0.2}}, std::make_tuple(0.f, 1.0f, 0.f)));
 
-	auto font = "resources/TypeWritersSubstitute-Black.ttf";
+	auto font = "resources/ComicNeue-Bold.ttf";
 	auto fontSize = 50;
 
 

resources/TypeWritersSubstitute-Oblique.ttf

@@ -1,22 +1,41 @@
 #include "GameDice.h"
 #include "GameVisitor.h"
 
-int GameDice::getFirst(){
-	return first;
-}
+#include <cstdlib>
 
-int GameDice::getSecond(){
-	return second;
+using std::rand;
+
+/**
+ * Re-roll the dice.
+ * @return The sum of the two dice.
+ */
+int GameDice::roll() {
+	first = rand() % 6 + 1;
+	second = rand() % 6 + 1;
+	
+	return first + second;
 }
 
-void GameDice::setFirst(int newFirst){
-	first = newFirst;
+/**
+ * The value of the first die.
+ * @return The first die's value.
+ */
+int GameDice::getFirst() const {
+	return first;
 }
 
-void GameDice::setSecond(int newSecond){
-	second = newSecond;
+/**
+ * The value of the second die.
+ * @return The second die's value.
+ */
+int GameDice::getSecond() const {
+	return second;
 }
 
+/**
+ * Double-dispatch method for GameVisitor.
+ * @param visitor The visitor.
+ */
 void GameDice::accept(GameVisitor& visitor) {
 	visitor.visit(*this);
 }

src/GameBoard.cpp

@@ -135,7 +135,7 @@ void GameView::render() {
 		highlightPoint(it);
 	}
 
-	auto font = "resources/TypeWritersSubstitute-Black.ttf";
+	auto font = "resources/ComicNeue-Bold.ttf";
 	auto fontSize = 50;
 
 	glColor3d(1, 1, 1);
@@ -650,8 +650,8 @@ 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, 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"),
+	trade(std::bind(trade, std::ref(offer), std::placeholders::_1), {{0.7, 0.1}, {0.9, 0.2}}, "resources/ComicNeue-Bold.ttf", 50, "Trade"),
+	cancel(cancel, {{0.1, 0.1}, {0.3, 0.2}}, "resources/ComicNeue-Bold.ttf", 50, "Cancel"),
 	offer(initialOffer) {
 
 }
@@ -696,7 +696,7 @@ void TradingView::render() {
 	glVertex2f(topLeft.first, bottomRight.second);
 	glEnd();
 
-	auto font = "resources/TypeWritersSubstitute-Black.ttf";
+	auto font = "resources/ComicNeue-Bold.ttf";
 	auto fontSize = 50;
 
 	std::string resources[] = {"Wood", "Brick", "Ore", "Wheat", "Wool"};
@@ -724,7 +724,7 @@ ConfirmationDialogue::ConfirmationDialogue(std::function<bool(ScreenCoordinate)>
 	ScreenCoordinate cancelTopLeft = ScreenCoordinate(topLeft.first + (width*.6), topLeft.second + (height *.1));
 	ScreenCoordinate cancelBottomRight = ScreenCoordinate(bottomRight.first - (width * .1), bottomRight.second - (height * .6));
 
-	auto font = "resources/TypeWritersSubstitute-Black.ttf";
+	auto font = "resources/ComicNeue-Bold.ttf";
 	auto fontSize = 50;
 
 	confirmButton = std::unique_ptr<ViewElement>(new ViewButtonText(confirm_action, {confirmTopLeft, confirmBottomRight}, font, fontSize, "Yes"));
@@ -751,7 +751,7 @@ void ConfirmationDialogue::render(){
 	glVertex2f(topLeft.first, bottomRight.second);
 	glEnd();
 
-	auto font = "resources/TypeWritersSubstitute-Black.ttf";
+	auto font = "resources/ComicNeue-Bold.ttf";
 	auto fontSize = 50;
 	float width = bottomRight.first - topLeft.first;
 	float height = bottomRight.second - topLeft.second;