diff options
| author | Vitaly Novichkov <admin@wohlnet.ru> | 2018-08-06 01:56:50 +0300 |
|---|---|---|
| committer | Vitaly Novichkov <admin@wohlnet.ru> | 2018-08-06 01:56:50 +0300 |
| commit | 1ab34e88a326c396fbb42c503eb4ffa56fa0a148 (patch) | |
| tree | 4f2d6ada0ab0bd1d64947a71c5492a29be7c8dbf /utils/adlmidi-2/puzzlegame.cc | |
| parent | 0a003c8bc12514a5586f2f0e40559fcbf6607883 (diff) | |
| parent | 0e2807a9d4c8c900e85c9b33ba96c69a82c58a68 (diff) | |
| download | libADLMIDI-1ab34e88a326c396fbb42c503eb4ffa56fa0a148.tar.gz libADLMIDI-1ab34e88a326c396fbb42c503eb4ffa56fa0a148.tar.bz2 libADLMIDI-1ab34e88a326c396fbb42c503eb4ffa56fa0a148.zip | |
Merge branch 'master' into stable
Diffstat (limited to 'utils/adlmidi-2/puzzlegame.cc')
| -rw-r--r-- | utils/adlmidi-2/puzzlegame.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/utils/adlmidi-2/puzzlegame.cc b/utils/adlmidi-2/puzzlegame.cc index f8fa57c..e7b9890 100644 --- a/utils/adlmidi-2/puzzlegame.cc +++ b/utils/adlmidi-2/puzzlegame.cc @@ -90,7 +90,7 @@ bool ADLMIDI_PuzzleGame::TetrisArea::CascadeEmpty(int FirstY) * FIXME: Improve weird code fragment disliked by CLang * /////////BEGIN//////////// */ - auto label = + auto label = & " SINGLE " " DOUBLE " " TRIPLE " @@ -100,7 +100,7 @@ bool ADLMIDI_PuzzleGame::TetrisArea::CascadeEmpty(int FirstY) " SEXTUPLE " " SEPTUPLE " " OCTUPLE " - + ((n_full - 1) * 10); + [(n_full - 1) * 10]; for(int y = FirstY; y < Height - 1; ++y) { if(list_full & (1u << y)) @@ -214,9 +214,9 @@ int ADLMIDI_PuzzleGame::TetrisAIengine::AI_Run(const decltype(Area)&in_area, con for(unsigned rot2 = 0; rot2 < 4; ++rot2) for(int x2 = -1; x2 <= 1; ++x2) { - positions1.push_back(std::move<position> ({int(rot), x, int(rot2), x2})); + positions1.push_back(position{int(rot), x, int(rot2), x2}); if(rot2 == rot && x2 == 0) - positions2.push_back(std::move<position> ({int(rot), x, int(rot2), x2})); + positions2.push_back(position{int(rot), x, int(rot2), x2}); } confident = false; |