twisla/roro9stack
Public Access
1
0
Fork 0
Code Issues 34 Pull Requests Actions Packages Releases 29 Activity

Games App: Minesweeper and 2048

Browse Source 
Two more Games in the row of icons, which now holds five. Minesweeper
moves a cursor (a held arrow runs it along), digs with Enter, flags with
f, shows where the mines were when it is lost, and keeps the fastest
cleared field. 2048 slides with the arrows and keeps the best score; it
has no clock, so nothing to pause. Neither keeps the screen lit.

Played on the device: Minesweeper's cells went from 8 to 12 pixels to be
read, and its field to 20 x 9.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_0162FokPdvY2KsS4NBfwyWPk
This commit is contained in:
twisla
2026-10-14 18:46:49 +02:00
co-authored by Claude Opus 5.5
parent fcc5533c83
commit b1e6242b29
11 changed files with 371 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/games_app.h
+20 -5
View File
@@ -6,11 +6,13 @@
#include "app.h"
#include "key_mapper.h"
#include "key_value_store.h"
#include "mines.h"
#include "pong.h"
#include "settings.h"
#include "snake.h"
#include "tetris.h"
#include "tune.h"
#include "twenty48.h"
namespace roro {
@@ -29,10 +31,12 @@ class GamesApp : public App {
void help(std::vector<KeyHelp>& out) const override;
const char* helpTitle() const override;
// A Game being played is the device in use, key or no key: the screen stays lit.
bool keepsScreenOn() const override { return which_ != Menu && state_[which_] == State::Playing; }
// Not for the two that wait for a move: there a key is pressed, or nobody is playing.
bool keepsScreenOn() const override { return which_ <= Tetris && state_[which_] == State::Playing; }
private:
enum Which { Pong, Snake, Tetris, Menu }; // the first three index the arrays
enum Which { Pong, Snake, Tetris, Mines, Twenty48, Menu }; // all but the last index the arrays
static constexpr int kGames = 5;
enum class State : uint8_t { Ready, Playing, Paused, Over };
void begin(); // a new game of the one chosen
@@ -48,6 +52,11 @@ class GamesApp : public App {
bool pongKey(const KeyEvent& e);
bool snakeKey(const KeyEvent& e);
bool tetrisKey(const KeyEvent& e);
bool minesKey(const KeyEvent& e);
bool twenty48Key(const KeyEvent& e);
void moveCursor(int dc, int dr);
void drawMines(Canvas& c);
void drawTwenty48(Canvas& c);
void drawMenu(Canvas& c);
void drawPong(Canvas& c);
void drawSnake(Canvas& c);
@@ -57,14 +66,20 @@ class GamesApp : public App {
const KeyMapper& keys_;
const Settings& settings_;
KeyValueStore& store_;
int chosen_ = 0; // in the row of three
int chosen_ = 0; // in the row of games
Which which_ = Menu;
State state_[3] = {State::Ready, State::Ready, State::Ready};
int best_[3] = {-1, -1, -1}; // -1: not read from the store yet
State state_[kGames] = {State::Ready, State::Ready, State::Ready, State::Ready, State::Ready};
int best_[kGames] = {-1, -1, -1, -1, -1}; // -1: not read from the store yet
bool newBest_ = false;
std::unique_ptr<games::Pong> pong_;
std::unique_ptr<games::Snake> snake_;
std::unique_ptr<games::Tetris> tetris_;
std::unique_ptr<games::Mines> mines_;
std::unique_ptr<games::Twenty48> twenty48_;
// Minesweeper's cursor, and the arrow held to run it along.
int cursorCol_ = 0, cursorRow_ = 0, runDir_ = -1;
uint32_t runMs_ = 0, shownSeconds_ = 0;
bool running_ = false;
uint32_t lastMs_ = 0, lastDrawMs_ = 0;
// Keys that came as presses since the last step: a tap moves too, held or not.
int tapMove_ = 0;