Refactor/round end (#479)

* Initial round_end extraction

* move hands to game vars

* Checkpoint

* Finish removing all variables for state fns

* Move over round_end substate functions

* Move over round_end with compile

* working in general

* Fix round start state issue

* clang-format

* Fix clang format issue

* PR fixes and standardize types in game vars struct

* Clang-format
This commit is contained in:
Rickey
2026-05-13 18:22:02 -07:00
committed by GitHub
parent 57ec84fcc7
commit b1c2b7f35e
10 changed files with 606 additions and 547 deletions
+12 -3
View File
@@ -23,6 +23,9 @@
#define DEFAULT_MUSIC_VOLUME VOLUME_OPTION_MAX
#define DEFAULT_SOUND_VOLUME VOLUME_OPTION_MAX
#define MAX_HANDS 4
#define MAX_DISCARDS 4
/**
* @brief A central location for all game variables.
*
@@ -39,9 +42,9 @@ typedef struct
// Variables visible by the player
int round;
int ante;
int money;
s32 round;
s32 ante;
s32 money;
// Blind variables
@@ -49,6 +52,12 @@ typedef struct
enum BlindType next_boss_blind;
enum BlindState blinds_states[NUM_BLINDS_PER_ANTE];
s32 hands;
s32 discards;
u32 score;
Sprite* playing_blind_token;
Sprite* round_end_blind_token;
// Options variables
// BY DEFAULT IS SET TO 1, but if changed to 2 or more, should speed up all (or most) of the