From f11000b17655bccd832634e82aad1b040e3822a3 Mon Sep 17 00:00:00 2001 From: Dmitrii Ubskii Date: Sat, 12 Jun 2021 02:46:11 +0300 Subject: [PATCH] 2048: Fix move success detection Whether or not tiles moved used to be determined by comparing new_tiles with m_tiles. This is no longer possible since the slide is done in-place. This fix makes the game look through the m_sliding_tiles, which contains previous and current position for each tile on the board, to determine whether any tile moved at all. If not, the move is deemed unsuccessful. Fixes #8008. --- Userland/Games/2048/Game.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Userland/Games/2048/Game.cpp b/Userland/Games/2048/Game.cpp index ce827d29ff..5319ba41aa 100644 --- a/Userland/Games/2048/Game.cpp +++ b/Userland/Games/2048/Game.cpp @@ -187,7 +187,6 @@ static size_t get_number_of_free_cells(Game::Board const& board) Game::Board::SlideResult Game::Board::slide_tiles(Direction direction) { size_t successful_merge_score = 0; - Tiles new_tiles; switch (direction) { case Direction::Left: @@ -215,7 +214,11 @@ Game::Board::SlideResult Game::Board::slide_tiles(Direction direction) break; } - bool moved = new_tiles != m_tiles; + bool moved = false; + for (auto& t : m_sliding_tiles) { + if (t.row_from != t.row_to || t.column_from != t.column_to) + moved = true; + } return { moved, successful_merge_score }; }