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: >
clang-format --dry-run -Werror
include/bitset.h source/bitset.c
include/card.h source/card.c
include/hand_analysis.h source/hand_analysis.c
include/list.h source/list.c
include/sprite.h source/sprite.c
include/card.h
+12 -12
View File
@@ -1,11 +1,11 @@
#ifndef CARD_H
#define CARD_H
#include <tonc.h>
#include <maxmod.h>
#include "sprite.h"
#include <maxmod.h>
#include <tonc.h>
#define MAX_CARDS (NUM_SUITS * NUM_RANKS)
#define MAX_CARDS_ON_SCREEN 16
@@ -49,23 +49,23 @@ typedef struct Card
typedef struct CardObject
{
Card *card;
SpriteObject *sprite_object;
Card* card;
SpriteObject* sprite_object;
} CardObject;
// Card functions
void card_init();
// Card methods
Card *card_new(u8 suit, u8 rank);
void card_destroy(Card **card);
u8 card_get_value(Card *card);
Card* card_new(u8 suit, u8 rank);
void card_destroy(Card** card);
u8 card_get_value(Card* card);
// CardObject methods
CardObject *card_object_new(Card *card);
void card_object_destroy(CardObject **card_object);
void card_object_update(CardObject *card_object); // Update the card object position and scale
void card_object_set_sprite(CardObject *card_object, int layer);
CardObject* card_object_new(Card* card);
void card_object_destroy(CardObject** card_object);
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_shake(CardObject* card_object, mm_word sound_id);
void card_object_set_selected(CardObject* card_object, bool selected);
source/card.c
+23 -18
View File
@@ -1,18 +1,17 @@
#include "card.h"
#include <maxmod.h>
#include <stdlib.h>
#include "deck_gfx.h"
#include "graphic_utils.h"
#include <maxmod.h>
#include <stdlib.h>
// Audio
#include "pool.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.
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},
{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},
@@ -25,9 +24,9 @@ void card_init()
}
// 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->rank = rank;
@@ -35,13 +34,13 @@ Card *card_new(u8 suit, u8 rank)
return card;
}
void card_destroy(Card **card)
void card_destroy(Card** card)
{
POOL_FREE(Card, *card);
*card = NULL;
}
u8 card_get_value(Card *card)
u8 card_get_value(Card* card)
{
if (card->rank == JACK || card->rank == QUEEN || card->rank == KING)
{
@@ -60,9 +59,9 @@ u8 card_get_value(Card *card)
}
// 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->sprite_object = sprite_object_new();
@@ -70,9 +69,10 @@ CardObject *card_object_new(Card *card)
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));
POOL_FREE(CardObject, *card_object);
*card_object = NULL;
@@ -80,15 +80,20 @@ void card_object_destroy(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);
}
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);
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);
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));
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);
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)