[Enhancement] Game Over screen rework (#548)
* WIP * getting somewhere * clean up everything real good * doc * clang format * Fix round.c after merge * Remove extra deck_pop declaration * Remove unnecessary comment * address MeirGavish's review --------- Co-authored-by: MathisMartin31 <mathis.martin31@gmail.com>
This commit is contained in:
+1
-1
@@ -7,7 +7,7 @@
|
||||
#include <maxmod.h>
|
||||
#include <tonc.h>
|
||||
|
||||
#define MAX_CARDS (NUM_SUITS * NUM_RANKS)
|
||||
#define MAX_CARDS 128 // Arbitrary high value so we don't have issues
|
||||
#define MAX_CARDS_ON_SCREEN 16
|
||||
|
||||
#define CARD_TID 0
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
#define GAME_VARIABLES_H
|
||||
|
||||
#include "blind.h"
|
||||
#include "hand.h"
|
||||
#include "random.h"
|
||||
|
||||
#include <tonc.h>
|
||||
@@ -49,6 +50,9 @@ typedef struct
|
||||
s32 hand_size;
|
||||
s32 deck;
|
||||
|
||||
u32 best_hand_score;
|
||||
u32 nb_played_hands[HAND_TYPE_MAX];
|
||||
|
||||
// Blind variables
|
||||
|
||||
enum BlindType current_blind;
|
||||
|
||||
+6
-1
@@ -40,7 +40,8 @@ enum HandType
|
||||
ROYAL_FLUSH,
|
||||
FIVE_OF_A_KIND,
|
||||
FLUSH_HOUSE,
|
||||
FLUSH_FIVE
|
||||
FLUSH_FIVE,
|
||||
HAND_TYPE_MAX = FLUSH_FIVE
|
||||
};
|
||||
|
||||
// clang-format off
|
||||
@@ -71,6 +72,10 @@ typedef struct ContainedHandTypes
|
||||
} ContainedHandTypes;
|
||||
// clang-format on
|
||||
|
||||
// Misc Hand Functions
|
||||
|
||||
const char* get_hand_type_name(enum HandType hand_type);
|
||||
|
||||
// Hand Structure Manipulation
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user