Merge pull request #40 from Databean/colorTuple

Changed player color to a tuple

Author: Kdog0073

include/Player.h

@@ -48,7 +48,7 @@ class Player {
     int resources[5];
     int tradeModifiers[5];
 
-    float color[3];
+    std::tuple<float, float, float> color;
 
 
     void tradeWithBank(std::array<int, 5> offer, std::array<int, 5> demand);
@@ -71,7 +71,7 @@ class Player {
     void setLongestRoad(bool);
     void setLongestRoadSize(int);
 
-    float* getColor();
+    std::tuple<float, float, float> getColor();
 
     int getVictoryPointsWithoutCards();
     int getVictoryPointCards();

src/GameView.cpp

@@ -415,8 +415,8 @@ void DrawingGameVisitor::visit(Road& road) {
 	auto cosPerp = std::cos(roadPerpAngle);
 	auto sinPerp = std::sin(roadPerpAngle);
 
-	float* color = road.getOwner().getColor();
-	glColor3d(color[0], color[1], color[2]);
+	auto color = road.getOwner().getColor();
+	glColor3f(std::get<0>(color), std::get<1>(color), std::get<2>(color));
 
 	glBindTexture(GL_TEXTURE_2D, 0);
 	glBegin(GL_QUADS);
@@ -437,8 +437,8 @@ void DrawingGameVisitor::visit(Settlement& settlement) {
 	auto centerScreenPos = coordToScreen(settlement.getLocation());
 
 	glBindTexture(GL_TEXTURE_2D, 0);
-	float* color = settlement.getOwner().getColor();
-	glColor3d(color[0], color[1], color[2]);
+	auto color = settlement.getOwner().getColor();
+	glColor3f(std::get<0>(color), std::get<1>(color), std::get<2>(color));
 
 	glBegin(GL_QUADS);
 	glVertex2d(centerScreenPos.first, centerScreenPos.second + settlementRadius);
@@ -459,8 +459,8 @@ void DrawingGameVisitor::visit(City& city) {
 
 	glBindTexture(GL_TEXTURE_2D, 0);
 
-	float* color = city.getOwner().getColor();
-	glColor3d(color[0], color[1], color[2]);
+	auto color = city.getOwner().getColor();
+	glColor3f(std::get<0>(color), std::get<1>(color), std::get<2>(color));
 
 	glBegin(GL_QUADS);
 	glVertex2d(centerScreenPos.first + cityRadius, centerScreenPos.second + cityRadius);
@@ -481,8 +481,8 @@ void DrawingGameVisitor::visit(Wonder& wonder) {
 
 	glBindTexture(GL_TEXTURE_2D, 0);
 
-	float* color = wonder.getOwner().getColor();
-	glColor3d(color[0], color[1], color[2]);
+	auto color = wonder.getOwner().getColor();
+	glColor3f(std::get<0>(color), std::get<1>(color), std::get<2>(color));
 
 	glBegin(GL_QUADS);
 	glVertex2d(centerScreenPos.first + wonderRadius, centerScreenPos.second + wonderRadius);

src/Player.cpp

@@ -49,11 +49,14 @@ Player::Player(GameBoard& board, std::string playerName) : name(playerName), boa
 		c = 0;
 	}
 
-	color[0] = .01 * (float)(std::rand()%101);
-	color[1] = .01 * (float)(std::rand()%101);
-	color[2] = .01 * (float)(std::rand()%101);
-
-	color[std::rand()%3] = 0;
+	std::get<0>(color) = .01 * (float)(std::rand()%101);
+	std::get<1>(color) = .01 * (float)(std::rand()%101);
+	std::get<2>(color) = .01 * (float)(std::rand()%101);
+	
+	int zeroChannel = std::rand()%3;
+	if(zeroChannel == 0) { std::get<0>(color) = 0; }
+	if(zeroChannel == 1) { std::get<1>(color) = 0; }
+	if(zeroChannel == 2) { std::get<2>(color) = 0; }
 
 }
 
@@ -91,11 +94,14 @@ Player::Player(GameBoard& board, XMLElement* elem) : board(board)
 	victoryPoints = 0;
 	baseVictoryPoints = 0;
 
-	color[0] = .01 * (float)(std::rand()%101);
-	color[1] = .01 * (float)(std::rand()%101);
-	color[2] = .01 * (float)(std::rand()%101);
-
-	color[std::rand()%3] = 0;
+	std::get<0>(color) = .01 * (float)(std::rand()%101);
+	std::get<1>(color) = .01 * (float)(std::rand()%101);
+	std::get<2>(color) = .01 * (float)(std::rand()%101);
+	
+	int zeroChannel = std::rand()%3;
+	if(zeroChannel == 0) { std::get<0>(color) = 0; }
+	if(zeroChannel == 1) { std::get<1>(color) = 0; }
+	if(zeroChannel == 2) { std::get<2>(color) = 0; }
 }
 
 /**
@@ -105,7 +111,7 @@ Player::~Player() {
 
 }
 
-float* Player::getColor(){
+std::tuple<float, float, float> Player::getColor(){
 	return color;
 }