wuxu/balatro-gba-chinese-jocker-descriptions
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Clang format card.c/h (#256)

Browse Source
This commit is contained in:
Rickey
2025-11-26 00:52:04 +02:00
committed by GitHub
parent 09dd996181
commit 184ee719b3
3 changed files with 60 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/run_tests_ci_workflow.yml
+1
View File
@@ -20,6 +20,7 @@ jobs:
run: > run: >
clang-format --dry-run -Werror clang-format --dry-run -Werror
include/bitset.h source/bitset.c include/bitset.h source/bitset.c
include/card.h source/card.c
include/hand_analysis.h source/hand_analysis.c include/hand_analysis.h source/hand_analysis.c
include/list.h source/list.c include/list.h source/list.c
include/sprite.h source/sprite.c include/sprite.h source/sprite.c
include/card.h
+35 -35
View File
@@ -1,41 +1,41 @@
#ifndef CARD_H #ifndef CARD_H
#define CARD_H #define CARD_H
#include <tonc.h>
#include <maxmod.h>
#include "sprite.h" #include "sprite.h"
#define MAX_CARDS (NUM_SUITS * NUM_RANKS) #include <maxmod.h>
#include <tonc.h>
#define MAX_CARDS (NUM_SUITS * NUM_RANKS)
#define MAX_CARDS_ON_SCREEN 16 #define MAX_CARDS_ON_SCREEN 16
#define CARD_TID 0 #define CARD_TID 0
#define CARD_SPRITE_OFFSET 16 #define CARD_SPRITE_OFFSET 16
#define CARD_PB 0 #define CARD_PB 0
#define CARD_STARTING_LAYER 0 #define CARD_STARTING_LAYER 0
// Card suits // Card suits
#define DIAMONDS 0 #define DIAMONDS 0
#define CLUBS 1 #define CLUBS 1
#define HEARTS 2 #define HEARTS 2
#define SPADES 3 #define SPADES 3
#define NUM_SUITS 4 #define NUM_SUITS 4
// Card ranks // Card ranks
#define TWO 0 #define TWO 0
#define THREE 1 #define THREE 1
#define FOUR 2 #define FOUR 2
#define FIVE 3 #define FIVE 3
#define SIX 4 #define SIX 4
#define SEVEN 5 #define SEVEN 5
#define EIGHT 6 #define EIGHT 6
#define NINE 7 #define NINE 7
#define TEN 8 #define TEN 8
#define JACK 9 #define JACK 9
#define QUEEN 10 #define QUEEN 10
#define KING 11 #define KING 11
#define ACE 12 #define ACE 12
#define NUM_RANKS 13 #define NUM_RANKS 13
#define RANK_OFFSET 2 // Because the first rank is 2 and ranks start at 0 #define RANK_OFFSET 2 // Because the first rank is 2 and ranks start at 0
#define IMPOSSIBLY_HIGH_CARD_VALUE 100 #define IMPOSSIBLY_HIGH_CARD_VALUE 100
@@ -49,27 +49,27 @@ typedef struct Card
typedef struct CardObject typedef struct CardObject
{ {
Card *card; Card* card;
SpriteObject *sprite_object; SpriteObject* sprite_object;
} CardObject; } CardObject;
// Card functions // Card functions
void card_init(); void card_init();
// Card methods // Card methods
Card *card_new(u8 suit, u8 rank); Card* card_new(u8 suit, u8 rank);
void card_destroy(Card **card); void card_destroy(Card** card);
u8 card_get_value(Card *card); u8 card_get_value(Card* card);
// CardObject methods // CardObject methods
CardObject *card_object_new(Card *card); CardObject* card_object_new(Card* card);
void card_object_destroy(CardObject **card_object); void card_object_destroy(CardObject** card_object);
void card_object_update(CardObject *card_object); // Update the card object position and scale void card_object_update(CardObject* card_object); // Update the card object position and scale
void card_object_set_sprite(CardObject *card_object, int layer); void card_object_set_sprite(CardObject* card_object, int layer);
void card_object_shake(CardObject* card_object, mm_word sound_id); void card_object_shake(CardObject* card_object, mm_word sound_id);
void card_object_set_selected(CardObject* card_object, bool selected); void card_object_set_selected(CardObject* card_object, bool selected);
bool card_object_is_selected(CardObject* card_object); bool card_object_is_selected(CardObject* card_object);
Sprite* card_object_get_sprite(CardObject* card_object); Sprite* card_object_get_sprite(CardObject* card_object);
#endif // CARD_H #endif // CARD_H
source/card.c
+24 -19
View File
@@ -1,19 +1,18 @@
#include "card.h" #include "card.h"
#include <maxmod.h>
#include <stdlib.h>
#include "deck_gfx.h" #include "deck_gfx.h"
#include "graphic_utils.h" #include "graphic_utils.h"
#include <maxmod.h>
#include <stdlib.h>
// Audio // Audio
#include "pool.h"
#include "soundbank.h" #include "soundbank.h"
#include "pool.h"
// Card sprites lookup table. First index is the suit, second index is the rank. The value is the tile index. // Card sprites lookup table. First index is the suit, second index is the rank. The value is the tile index.
const static u16 card_sprite_lut[NUM_SUITS][NUM_RANKS] = { const static u16 _card_sprite_lut[NUM_SUITS][NUM_RANKS] = {
{0, 16, 32, 48, 64, 80, 96, 112, 128, 144, 160, 176, 192}, {0, 16, 32, 48, 64, 80, 96, 112, 128, 144, 160, 176, 192},
{208, 224, 240, 256, 272, 288, 304, 320, 336, 352, 368, 384, 400}, {208, 224, 240, 256, 272, 288, 304, 320, 336, 352, 368, 384, 400},
{416, 432, 448, 464, 480, 496, 512, 528, 544, 560, 576, 592, 608}, {416, 432, 448, 464, 480, 496, 512, 528, 544, 560, 576, 592, 608},
{624, 640, 656, 672, 688, 704, 720, 736, 752, 768, 784, 800, 816} {624, 640, 656, 672, 688, 704, 720, 736, 752, 768, 784, 800, 816}
@@ -25,9 +24,9 @@ void card_init()
} }
// Card methods // Card methods
Card *card_new(u8 suit, u8 rank) Card* card_new(u8 suit, u8 rank)
{ {
Card *card = POOL_GET(Card); Card* card = POOL_GET(Card);
card->suit = suit; card->suit = suit;
card->rank = rank; card->rank = rank;
@@ -35,13 +34,13 @@ Card *card_new(u8 suit, u8 rank)
return card; return card;
} }
void card_destroy(Card **card) void card_destroy(Card** card)
{ {
POOL_FREE(Card, *card); POOL_FREE(Card, *card);
*card = NULL; *card = NULL;
} }
u8 card_get_value(Card *card) u8 card_get_value(Card* card)
{ {
if (card->rank == JACK || card->rank == QUEEN || card->rank == KING) if (card->rank == JACK || card->rank == QUEEN || card->rank == KING)
{ {
@@ -60,9 +59,9 @@ u8 card_get_value(Card *card)
} }
// CardObject methods // CardObject methods
CardObject *card_object_new(Card *card) CardObject* card_object_new(Card* card)
{ {
CardObject *card_object = POOL_GET(CardObject); CardObject* card_object = POOL_GET(CardObject);
card_object->card = card; card_object->card = card;
card_object->sprite_object = sprite_object_new(); card_object->sprite_object = sprite_object_new();
@@ -70,9 +69,10 @@ CardObject *card_object_new(Card *card)
return card_object; return card_object;
} }
void card_object_destroy(CardObject **card_object) void card_object_destroy(CardObject** card_object)
{ {
if (*card_object == NULL) return; if (*card_object == NULL)
return;
sprite_object_destroy(&((*card_object)->sprite_object)); sprite_object_destroy(&((*card_object)->sprite_object));
POOL_FREE(CardObject, *card_object); POOL_FREE(CardObject, *card_object);
*card_object = NULL; *card_object = NULL;
@@ -80,15 +80,20 @@ void card_object_destroy(CardObject **card_object)
void card_object_update(CardObject* card_object) void card_object_update(CardObject* card_object)
{ {
if (card_object == NULL) return; if (card_object == NULL)
return;
sprite_object_update(card_object->sprite_object); sprite_object_update(card_object->sprite_object);
} }
void card_object_set_sprite(CardObject *card_object, int layer) void card_object_set_sprite(CardObject* card_object, int layer)
{ {
int tile_index = CARD_TID + (layer * CARD_SPRITE_OFFSET); int tile_index = CARD_TID + (layer * CARD_SPRITE_OFFSET);
memcpy32(&tile_mem[4][tile_index], &deck_gfxTiles[card_sprite_lut[card_object->card->suit][card_object->card->rank] * TILE_SIZE], TILE_SIZE * CARD_SPRITE_OFFSET); memcpy32(&tile_mem[4][tile_index],
sprite_object_set_sprite(card_object->sprite_object, sprite_new(ATTR0_SQUARE | ATTR0_4BPP | ATTR0_AFF, ATTR1_SIZE_32, tile_index, 0, layer + CARD_STARTING_LAYER)); &deck_gfxTiles[_card_sprite_lut[card_object->card->suit][card_object->card->rank] * TILE_SIZE],
TILE_SIZE * CARD_SPRITE_OFFSET);
Sprite* sprite =
sprite_new(ATTR0_SQUARE | ATTR0_4BPP | ATTR0_AFF, ATTR1_SIZE_32, tile_index, 0, layer + CARD_STARTING_LAYER);
sprite_object_set_sprite(card_object->sprite_object, sprite);
} }
void card_object_shake(CardObject* card_object, mm_word sound_id) void card_object_shake(CardObject* card_object, mm_word sound_id)