bassguitarbill/hanafuda
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Address warnings

Browse Source
This commit is contained in:
Bill Rossi 2025-02-01 11:12:07 -05:00
parent 4dd45c42e8
commit 5e0109a9b6
5 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
card.c
View File

@ -1,5 +1,8 @@
#include "card.h" #include "card.h"
static Vector2 card_size = (Vector2) { CARD_WIDTH, CARD_HEIGHT };
static char *month_english_abbr[12] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
void draw_card(Card *c) { void draw_card(Card *c) {
DrawRectangleV(c->position, card_size, c->selected ? RED : BLACK); DrawRectangleV(c->position, card_size, c->selected ? RED : BLACK);
DrawRectangle(c->position.x + CARD_BORDER, c->position.y + CARD_BORDER, card_size.x - (CARD_BORDER * 2), card_size.y - (CARD_BORDER * 2) , WHITE); DrawRectangle(c->position.x + CARD_BORDER, c->position.y + CARD_BORDER, card_size.x - (CARD_BORDER * 2), card_size.y - (CARD_BORDER * 2) , WHITE);

4
card.h
View File

@ -9,7 +9,6 @@ typedef struct Hand Hand;
#define CARD_WIDTH 63 #define CARD_WIDTH 63
#define CARD_HEIGHT 105 #define CARD_HEIGHT 105
#define CARD_BORDER 5 #define CARD_BORDER 5
static Vector2 card_size = (Vector2) { CARD_WIDTH, CARD_HEIGHT };
typedef enum CardType { typedef enum CardType {
CHAFF, CHAFF,
@ -40,8 +39,6 @@ typedef enum Month {
DECEMBER DECEMBER
} Month; } Month;
static char *month_english_abbr[12] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
struct Card { struct Card {
int index; int index;
CardType type; CardType type;
@ -57,5 +54,6 @@ struct Hand {
}; };
void draw_card(Card *c); void draw_card(Card *c);
bool point_within_card(Card *c, Vector2 v);
#endif #endif

9
dekiyaku.c
View File

@ -1,3 +1,6 @@
#include <string.h>
#include <stdio.h>
#include "dekiyaku.h" #include "dekiyaku.h"
void calculate_dekiyaku(const Hand h, Dekiyaku *d) { void calculate_dekiyaku(const Hand h, Dekiyaku *d) {
@ -12,6 +15,7 @@ void calculate_dekiyaku(const Hand h, Dekiyaku *d) {
switch (card.ribbon_type) { switch (card.ribbon_type) {
case RIBBON_BLUE: blue_ribbons++; break; case RIBBON_BLUE: blue_ribbons++; break;
case RIBBON_POETRY: poetry_ribbons++; break; case RIBBON_POETRY: poetry_ribbons++; break;
default: break;
} }
break; break;
case ANIMAL: case ANIMAL:
@ -19,6 +23,7 @@ void calculate_dekiyaku(const Hand h, Dekiyaku *d) {
case JUNE: butterflies++; break; case JUNE: butterflies++; break;
case JULY: boar++; break; case JULY: boar++; break;
case OCTOBER: deer++; break; case OCTOBER: deer++; break;
default: break;
} }
break; break;
case CHAFF: case CHAFF:
@ -67,8 +72,6 @@ void calculate_dekiyaku(const Hand h, Dekiyaku *d) {
char *meld_name(DekiyakuMeldType d) { char *meld_name(DekiyakuMeldType d) {
switch (d) { switch (d) {
case NONE:
return "None";
case FIVE_BRIGHTS: case FIVE_BRIGHTS:
return "5B"; return "5B";
case FOUR_BRIGHTS: case FOUR_BRIGHTS:
@ -81,6 +84,8 @@ char *meld_name(DekiyakuMeldType d) {
return "BS"; return "BS";
case BOAR_DEER_BUTTERFLIES: case BOAR_DEER_BUTTERFLIES:
return "ISK"; return "ISK";
default:
return "None";
} }
} }

8
main.c
View File

@ -69,16 +69,16 @@ int main(int argc, char** argv) {
cards[i] = (Card) { i, t, rt, month, (Vector2) { month * 65, (i % 4) * 110 }, false }; cards[i] = (Card) { i, t, rt, month, (Vector2) { month * 65, (i % 4) * 110 }, false };
} }
float delta; // float delta;
Vector2 mouse_position; Vector2 mouse_pos;
char *teyaku_calculation = ""; char *teyaku_calculation = "";
char dekiyaku_calculation[400]; char dekiyaku_calculation[400];
while (!WindowShouldClose()) { while (!WindowShouldClose()) {
delta = GetFrameTime(); // delta = GetFrameTime();
if (IsMouseButtonPressed(0)) { if (IsMouseButtonPressed(0)) {
Vector2 mouse_pos = GetMousePosition(); mouse_pos = GetMousePosition();
for (int i = 0; i < 48; i++) { for (int i = 0; i < 48; i++) {
if (point_within_card(&cards[i], mouse_pos)) { if (point_within_card(&cards[i], mouse_pos)) {
cards[i].selected = !cards[i].selected; cards[i].selected = !cards[i].selected;

2
move.c
View File

@ -19,5 +19,7 @@ Vector2 move_position(Move *m, float delta) {
((m->destination.x - m->origin.x) * percentage) + m->origin.x, ((m->destination.x - m->origin.x) * percentage) + m->origin.x,
((m->destination.y - m->origin.y) * percentage) + m->origin.y ((m->destination.y - m->origin.y) * percentage) + m->origin.y
}; };
default:
return m->destination;
} }
} }