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

Game works again

Browse Source
This commit is contained in:
Bill Rossi 2025-02-25 05:29:50 -05:00
parent 71ca76339e
commit b5721105b1
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
card.c
View File

@ -15,7 +15,6 @@ void draw_card(Card *c, Texture2D *cards_texture, int index) {
Color color = index == 1 ? BLACK : BRICKRED; Color color = index == 1 ? BLACK : BRICKRED;
if (c->visible) { if (c->visible) {
printf("draw card %p\n", cards_texture); fflush(stdout);
DrawTexturePro( DrawTexturePro(
*cards_texture, *cards_texture,
(Rectangle) { pos_horiz, pos_vert, CARD_WIDTH, CARD_HEIGHT }, (Rectangle) { pos_horiz, pos_vert, CARD_WIDTH, CARD_HEIGHT },

12
game.c
View File

@ -23,8 +23,6 @@ void initialize_game(Game *g) {
g->cards_texture_black = LoadTextureFromImage(cards_image_black); g->cards_texture_black = LoadTextureFromImage(cards_image_black);
UnloadImage(cards_image_black); UnloadImage(cards_image_black);
printf("%p %p\n", &g->cards_texture_black, &g->cards_texture_red);
g->deck.count = 0; g->deck.count = 0;
g->deck.position = (Vector2) { 500, 300 }; g->deck.position = (Vector2) { 500, 300 };
g->deck.display_type = HAND_DISPLAY_DECK; g->deck.display_type = HAND_DISPLAY_DECK;
@ -85,11 +83,9 @@ void initialize_game(Game *g) {
g->cards[i].order = i; g->cards[i].order = i;
g->cards[i].selected = false; g->cards[i].selected = false;
g->cards[i].visible = false; g->cards[i].visible = false;
g->deck.count++; g->deck.cards[g->deck.count++] = &g->cards[i];
} }
printf("DONE CARDS\n");
g->player.points = 100 * g->kan_value; g->player.points = 100 * g->kan_value;
g->right.points = 100 * g->kan_value; g->right.points = 100 * g->kan_value;
g->left.points = 100 * g->kan_value; g->left.points = 100 * g->kan_value;
@ -873,7 +869,7 @@ void draw_cards(Game *g) {
draw_player_cards(g, &g->left); draw_player_cards(g, &g->left);
for (int i = 0; i < g->field.count; i++) { for (int i = 0; i < g->field.count; i++) {
draw_card(g->field.cards[i], cards_texture_fun(g), g->black_card_backs); draw_card(g->field.cards[i], cards_texture_fun(g), g->black_card_backs);
} }
for (int i = 0; i < g->deck.count; i++) { for (int i = 0; i < g->deck.count; i++) {
draw_card(g->deck.cards[i], cards_texture_fun(g), g->black_card_backs); draw_card(g->deck.cards[i], cards_texture_fun(g), g->black_card_backs);
@ -890,14 +886,14 @@ void draw_frame(Game *g) {
return; return;
} }
draw_cards(g);
if (g->state == GAME_STATE_OPTIONS) { if (g->state == GAME_STATE_OPTIONS) {
options_draw(g); options_draw(g);
EndDrawing(); EndDrawing();
return; return;
} }
draw_cards(g);
if (g->state == GAME_STATE_DEALING) { if (g->state == GAME_STATE_DEALING) {
DrawText("Dealing....", 60, 385, 40, BLACK); DrawText("Dealing....", 60, 385, 40, BLACK);
} else if (g->field_multiplier) { } else if (g->field_multiplier) {

1
options.c
View File

@ -1,3 +1,4 @@
#include <stdio.h>
#include "options.h" #include "options.h"
int kan_value_from_index(int index) { return index == 0 ? 10 : 12; } int kan_value_from_index(int index) { return index == 0 ? 10 : 12; }

4
title.c
View File

@ -10,6 +10,9 @@ void initialize_title(Game *g) {
} }
void title_handle_click_start(Game *g) { void title_handle_click_start(Game *g) {
for (int i = 0; i < 48; i++) {
g->cards[i].move.end_time = 0.;
}
g->state = GAME_STATE_INITIALIZING; g->state = GAME_STATE_INITIALIZING;
} }
@ -108,7 +111,6 @@ void title_fly_card(Game *g, Card *card) {
move->current_time = 0.; move->current_time = 0.;
move->end_time = (rand() % 5) + 1; move->end_time = (rand() % 5) + 1;
printf("current: %f, end: %f\n", card->move.current_time, card->move.end_time);
} }
void run_frame_title(Game *g) { void run_frame_title(Game *g) {