Commit 2c14ee16 authored by Frederik Schwarzer's avatar Frederik Schwarzer
Browse files

Remove assignment operator on initialisation.

parent 52928603
...@@ -45,9 +45,9 @@ namespace KShisen ...@@ -45,9 +45,9 @@ namespace KShisen
#define SEASONS_START 28 #define SEASONS_START 28
#define FLOWERS_START 39 #define FLOWERS_START 39
static std::array<int, 5> const s_delay = {{1000, 750, 500, 250, 125}}; static std::array<int, 5> const s_delay {{1000, 750, 500, 250, 125}};
static std::array<int, 6> const s_sizeX = {{14, 16, 18, 24, 26, 30}}; static std::array<int, 6> const s_sizeX {{14, 16, 18, 24, 26, 30}};
static std::array<int, 6> const s_sizeY = {{6, 9, 8, 12, 14, 16}}; static std::array<int, 6> const s_sizeY {{6, 9, 8, 12, 14, 16}};
Board::Board(QWidget * parent) Board::Board(QWidget * parent)
: QWidget(parent) : QWidget(parent)
...@@ -226,7 +226,7 @@ void Board::applyGravity(TilePos const tilePos1, TilePos const tilePos2) ...@@ -226,7 +226,7 @@ void Board::applyGravity(TilePos const tilePos1, TilePos const tilePos2)
// column twice but all ideas I had to prevent that from happening seemed // column twice but all ideas I had to prevent that from happening seemed
// more complex that living with that second iteration once in a while. // more complex that living with that second iteration once in a while.
// Maybe later ... (schwarzer) // Maybe later ... (schwarzer)
std::array<int, 2> const affectedColumns = {{tilePos1.x(), tilePos2.x()}}; std::array<int, 2> const affectedColumns {{tilePos1.x(), tilePos2.x()}};
for (auto const column : affectedColumns) { for (auto const column : affectedColumns) {
auto rptr = yTiles() - 1; auto rptr = yTiles() - 1;
auto wptr = yTiles() - 1; auto wptr = yTiles() - 1;
...@@ -1199,8 +1199,8 @@ int Board::findPath(TilePos const & tilePos1, TilePos const & tilePos2, Possible ...@@ -1199,8 +1199,8 @@ int Board::findPath(TilePos const & tilePos1, TilePos const & tilePos2, Possible
} }
// Find paths of 3 segments // Find paths of 3 segments
std::array<int, 4> const dx = {{1, 0, -1, 0}}; std::array<int, 4> const dx {{1, 0, -1, 0}};
std::array<int, 4> const dy = {{0, 1, 0, -1}}; std::array<int, 4> const dy {{0, 1, 0, -1}};
for (auto i = 0; i < 4; ++i) { for (auto i = 0; i < 4; ++i) {
auto tempX = tilePos1.x() + dx.at(i); auto tempX = tilePos1.x() + dx.at(i);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment