Show/hide card totals is now implemented

Author: malecki1

src/GameController.cpp

@@ -38,20 +38,20 @@ GameController::GameController(GameBoard& model, GameView& view) : model(model),
 
 	view.addElement(makeViewButtonText(std::bind(&GameController::handleCancelButtonEvent, this, _1), {{.92, .96}, {1.0, 1.0}}, font, fontSize, "Cancel"));
 
-	view.addElement(makeViewButtonText(std::bind(/*&GameController::handleBuyDevelopmentCardButtonEvent*/&GameController::viewCardTotals, this, _1), {{.85, .23}, {1, .30}}, font, fontSize, "Development Cards"));
+	view.addElement(makeViewButtonText(std::bind(&GameController::handleBuyDevelopmentCardButtonEvent, this, _1), {{.85, .23}, {1, .30}}, font, fontSize, "Development Cards"));
 	view.addElement(makeViewButtonText(std::bind(&GameController::handleRoadCardButtonEvent, this, _1), {{0.85, 0.0}, {0.97, 0.05}}, font, fontSize, "Road Building "));
 	view.addElement(makeViewButtonText(std::bind(&GameController::handleKnightCardButtonEvent, this, _1), {{0.85, 0.05}, {0.97, 0.10}},  font, fontSize, "Knight "));
 	view.addElement(makeViewButtonText(std::bind(&GameController::handleYearOfPlentyCardButtonEvent, this, _1), {{0.85, 0.10}, {0.97, 0.15}},  font, fontSize, "Year of Plenty "));
 	view.addElement(makeViewButtonText(std::bind(&GameController::handleMonopolyCardButtonEvent, this, _1), {{0.85, 0.15}, {0.97, 0.20}},  font, fontSize, "Monopoly "));
 	view.addElement(makeViewButtonText(std::bind(&GameController::handleVictoryPointCardButtonEvent, this, _1), {{0.85, 0.20}, {0.97, 0.25}},  font, fontSize, "Victory Point "));
 
-	view.addElement(makeViewButtonText(std::bind(&GameController::handleWoodButtonEvent, this, _1), {{.85, .35}, {.97, .40}}, font, fontSize, "Wood "));
-	view.addElement(makeViewButtonText(std::bind(&GameController::handleSheepButtonEvent, this, _1), {{.85, .40}, {.97, .45}}, font, fontSize, "Sheep "));
-	view.addElement(makeViewButtonText(std::bind(&GameController::handleOreButtonEvent, this, _1), {{.85, .45}, {.97, .50}}, font, fontSize, "Ore "));
-	view.addElement(makeViewButtonText(std::bind(&GameController::handleBrickButtonEvent, this, _1), {{.85, .50}, {.97, .55}}, font, fontSize, "Brick "));
-	view.addElement(makeViewButtonText(std::bind(&GameController::handleWheatButtonEvent, this, _1), {{.85, .55}, {.97, .60}}, font, fontSize, "Wheat "));
+	view.addElement(makeViewButtonText(std::bind(&GameController::handleWoodButtonEvent, this, _1), {{.85, .30}, {.97, .35}}, font, fontSize, "Wood "));
+	view.addElement(makeViewButtonText(std::bind(&GameController::handleSheepButtonEvent, this, _1), {{.85, .35}, {.97, .40}}, font, fontSize, "Sheep "));
+	view.addElement(makeViewButtonText(std::bind(&GameController::handleOreButtonEvent, this, _1), {{.85, .40}, {.97, .45}}, font, fontSize, "Ore "));
+	view.addElement(makeViewButtonText(std::bind(&GameController::handleBrickButtonEvent, this, _1), {{.85, .45}, {.97, .50}}, font, fontSize, "Brick "));
+	view.addElement(makeViewButtonText(std::bind(&GameController::handleWheatButtonEvent, this, _1), {{.85, .50}, {.97, .55}}, font, fontSize, "Wheat "));
 
-    //view.addElement(makeViewButtonText(std::bind(&GameController::viewCardTotals, this, _1), {{.85, .35}, {.97, .35}}, font, fontSize, "Show Totals"));
+    view.addElement(makeViewButtonText(std::bind(&GameController::viewCardTotals, this, _1), {{.85, .55}, {.97, .60}}, font, fontSize, "Show Totals"));
 
 
 	stateStack.push_back(BASESTATE);

src/GameView.cpp

@@ -137,23 +137,23 @@ void GameView::drawResourceCount(std::string font, int fontSize)
 {
     if(showTotals==false)
     {
-        renderText(font, fontSize, {0.97, 0.35}, {1.0, 0.40}, "?");		//Wood
-        renderText(font, fontSize, {0.97, 0.40}, {1.0, 0.45}, "?");		//Sheep
-        renderText(font, fontSize, {0.97, 0.45}, {1.0, 0.50}, "?");		//Ore
-        renderText(font, fontSize, {0.97, 0.50}, {1.0, 0.55}, "?");		//Brick
-        renderText(font, fontSize, {0.97, 0.55}, {1.0, 0.60}, "?");     //Wheat
+        renderText(font, fontSize, {0.97, 0.30}, {1.0, 0.35}, "?");		//Wood
+        renderText(font, fontSize, {0.97, 0.35}, {1.0, 0.40}, "?");		//Sheep
+        renderText(font, fontSize, {0.97, 0.40}, {1.0, 0.45}, "?");		//Ore
+        renderText(font, fontSize, {0.97, 0.45}, {1.0, 0.50}, "?");		//Brick
+        renderText(font, fontSize, {0.97, 0.50}, {1.0, 0.55}, "?");     //Wheat
         return;
     }
 
-	renderText(font, fontSize, {0.97, 0.35}, {1.0, 0.40},
+	renderText(font, fontSize, {0.97, 0.30}, {1.0, 0.35},
 			toString(model.getCurrentPlayer().getWood()));		//Wood
-	renderText(font, fontSize, {0.97, 0.40}, {1.0, 0.45},
+	renderText(font, fontSize, {0.97, 0.35}, {1.0, 0.40},
 			toString(model.getCurrentPlayer().getWool()));		//Sheep
-	renderText(font, fontSize, {0.97, 0.45}, {1.0, 0.50},
+	renderText(font, fontSize, {0.97, 0.40}, {1.0, 0.45},
 			toString(model.getCurrentPlayer().getOre()));		//Ore
-	renderText(font, fontSize, {0.97, 0.50}, {1.0, 0.55},
+	renderText(font, fontSize, {0.97, 0.45}, {1.0, 0.50},
 			toString(model.getCurrentPlayer().getBrick()));		//Brick
-	renderText(font, fontSize, {0.97, 0.55}, {1.0, 0.60},
+	renderText(font, fontSize, {0.97, 0.50}, {1.0, 0.55},
 			toString(model.getCurrentPlayer().getWheat()));		//Wheat
 
 }