Skip to content

Commit 758d8ff

Browse files
committed
Merge pull request #62 from Databean/wonder_reposition_button
moved Wonder button so it doesn't overlap gameboard
2 parents d8fc842 + 6195ed5 commit 758d8ff

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/GameController.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ GameController::GameController(GameBoard& model, GameView& view) : model(model),
2525

2626
view.addElement(makeViewButtonText(std::bind(&GameController::handleRoadButtonEvent, this, _1), {{0, 0}, {0.1, 0.10}}, font, fontSize, "Road |"));
2727
view.addElement(makeViewButtonText(std::bind(&GameController::handleCityButtonEvent, this, _1), {{0.10, 0.0}, {0.20, 0.1}}, font, fontSize, "City |"));
28-
view.addElement(makeViewButtonText(std::bind(&GameController::handleSettlementButtonEvent, this, _1), {{0.20, 0.0}, {0.33, 0.1}}, font, fontSize, "Settlement |"));
29-
view.addElement(makeViewButtonText(std::bind(&GameController::handleWonderButtonEvent, this, _1), {{0.33, 0.0}, {0.43, 0.1}}, font, fontSize, "Wonder"));
28+
view.addElement(makeViewButtonText(std::bind(&GameController::handleSettlementButtonEvent, this, _1), {{0.20, 0.0}, {0.33, 0.1}}, font, fontSize, "Settlement"));
29+
view.addElement(makeViewButtonText(std::bind(&GameController::handleWonderButtonEvent, this, _1), {{0.55, 0.0}, {0.65, 0.1}}, font, fontSize, "|Wonder"));
3030
view.addElement(makeViewButtonText(std::bind(&GameController::nextTurn, this, _1), {{0, 0.3}, {0.1, 0.4}}, font, fontSize, "End Turn"));
3131

3232
auto playerTopY = 0.82;

0 commit comments

Comments
 (0)