Renamed GBLA_UNUSED -> GBAL_UNUSED and updated RowOnKeyTransitFunc documentation (#292)
This commit is contained in:
@@ -19,9 +19,10 @@ typedef void (*RowOnSelectionChangedFunc)(
|
|||||||
const Selection* new_selection
|
const Selection* new_selection
|
||||||
);
|
);
|
||||||
typedef int (*RowGetSizeFunc)();
|
typedef int (*RowGetSizeFunc)();
|
||||||
// Called for any non-directional key hit
|
|
||||||
// The key will not be passed, the function will have to check key_hit() etc. for the key it wants
|
// Called for any non-directional key transit (either hit down or release up)
|
||||||
// to check
|
// The key itself and hit/release event will not be passed,
|
||||||
|
// the function will have to check key_hit(), key_released() etc. for the key it wants to check
|
||||||
typedef void (*RowOnKeyTransitFunc)(SelectionGrid* selection_grid, Selection* selection);
|
typedef void (*RowOnKeyTransitFunc)(SelectionGrid* selection_grid, Selection* selection);
|
||||||
|
|
||||||
struct SelectionGridRow
|
struct SelectionGridRow
|
||||||
|
|||||||
+2
-2
@@ -10,10 +10,10 @@
|
|||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @def GBLA_UNUSED
|
* @def GBAL_UNUSED
|
||||||
* @brief A friendly wrapper around the not so friendly looking __attribute__ syntax for ((unused))
|
* @brief A friendly wrapper around the not so friendly looking __attribute__ syntax for ((unused))
|
||||||
*/
|
*/
|
||||||
#define GBLA_UNUSED __attribute__((unused))
|
#define GBAL_UNUSED __attribute__((unused))
|
||||||
|
|
||||||
#define UNDEFINED -1
|
#define UNDEFINED -1
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -45,7 +45,7 @@ static Blind _blind_type_map[BLIND_TYPE_MAX] = {
|
|||||||
|
|
||||||
static void s_blind_gfx_init(enum BlindType type);
|
static void s_blind_gfx_init(enum BlindType type);
|
||||||
|
|
||||||
GBLA_UNUSED
|
GBAL_UNUSED
|
||||||
void blind_set_boss_graphics(const unsigned int* tiles, const u16* palette)
|
void blind_set_boss_graphics(const unsigned int* tiles, const u16* palette)
|
||||||
{
|
{
|
||||||
// TODO: This function is unused and not fully fleshed out.
|
// TODO: This function is unused and not fully fleshed out.
|
||||||
|
|||||||
+1
-1
@@ -551,7 +551,7 @@ static int shortcut_joker_count = 0;
|
|||||||
static int four_fingers_joker_count = 0;
|
static int four_fingers_joker_count = 0;
|
||||||
static int straight_and_flush_size = STRAIGHT_AND_FLUSH_SIZE_DEFAULT;
|
static int straight_and_flush_size = STRAIGHT_AND_FLUSH_SIZE_DEFAULT;
|
||||||
|
|
||||||
GBLA_UNUSED
|
GBAL_UNUSED
|
||||||
static inline bool is_shop_joker_avail(int joker_id)
|
static inline bool is_shop_joker_avail(int joker_id)
|
||||||
{
|
{
|
||||||
return bitset_get_idx(&_avail_jokers_bitset, joker_id);
|
return bitset_get_idx(&_avail_jokers_bitset, joker_id);
|
||||||
|
|||||||
@@ -1459,10 +1459,10 @@ static u32 bootstraps_joker_effect(
|
|||||||
return effect_flags_ret;
|
return effect_flags_ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Using GBLA_UNUSED, aka __attribute__((unused)), for jokers with no sprites yet to avoid warning
|
// Using GBAL_UNUSED, aka __attribute__((unused)), for jokers with no sprites yet to avoid warning
|
||||||
// Remove the attribute once they have sprites
|
// Remove the attribute once they have sprites
|
||||||
// no graphics available but ready to be used if wanted when graphics available
|
// no graphics available but ready to be used if wanted when graphics available
|
||||||
GBLA_UNUSED
|
GBAL_UNUSED
|
||||||
static u32 shoot_the_moon_joker_effect(
|
static u32 shoot_the_moon_joker_effect(
|
||||||
Joker* joker,
|
Joker* joker,
|
||||||
Card* scored_card,
|
Card* scored_card,
|
||||||
@@ -1485,7 +1485,7 @@ static u32 shoot_the_moon_joker_effect(
|
|||||||
return effect_flags_ret;
|
return effect_flags_ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
GBLA_UNUSED
|
GBAL_UNUSED
|
||||||
static u32 photograph_joker_effect(
|
static u32 photograph_joker_effect(
|
||||||
Joker* joker,
|
Joker* joker,
|
||||||
Card* scored_card,
|
Card* scored_card,
|
||||||
|
|||||||
Reference in New Issue
Block a user