Merge pull request #37 from Databean/refactorDice

Merged

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	

src/GameBoard.cpp

@@ -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());
 }
 
 /**

src/GameDice.cpp

@@ -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);
 }