RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-28 11:47:34 +00:00
Code Issues Activity Actions

2048: Encapsulate away Board's inner workings

Browse source 
This change brings all the board twiddling code into the Board proper to
enable sliding animations further down the line.
This commit is contained in:
Dmitrii Ubskii 2021-06-11 18:21:16 +03:00 • committed by Andreas Kling
parent 9ce5ce3560
commit 8a8c2572b1
3 changed files with 117 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

33
Userland/Games/2048/Game.h
View file

@ -35,11 +35,14 @@ public:
u32 target_tile() const { return m_target_tile; }
u32 largest_tile() const;
struct Board {
class Board {
public:
using Row = Vector<u32>;
using Tiles = Vector<Row>;
Tiles tiles;
Tiles const& tiles() const { return m_tiles; }
bool is_stalled();
struct Position {
size_t row;
@ -53,11 +56,29 @@ public:
void add_tile(size_t row, size_t column, u32 value)
{
tiles[row][column] = value;
last_added_position = Position { row, column };
m_tiles[row][column] = value;
m_last_added_position = Position { row, column };
}
Position const& last_added_position() const { return m_last_added_position; }
Position last_added_position { 0, 0 };
struct SlideResult {
bool has_moved;
size_t score_delta;
};
SlideResult slide_tiles(Direction);
private:
void reverse();
void transpose();
size_t slide_row(size_t row_index);
size_t slide_left();
friend Game;
Tiles m_tiles;
Position m_last_added_position { 0, 0 };
};
Board const& board() const { return m_board; }
@ -71,8 +92,6 @@ public:
}
private:
bool slide_tiles(Direction);
void add_tile()
{
if (m_evil_ai)