From 5e0109a9b61fc14d880d6de0441e5395a1a18f27 Mon Sep 17 00:00:00 2001
From: Bill Rossi <bassguitarbill@gmail.com>
Date: Sat, 1 Feb 2025 11:12:07 -0500
Subject: [PATCH] Address warnings

---
 card.c     | 3 +++
 card.h     | 4 +---
 dekiyaku.c | 9 +++++++--
 main.c     | 8 ++++----
 move.c     | 2 ++
 5 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/card.c b/card.c
index 1d0efc7..7c7652f 100644
--- a/card.c
+++ b/card.c
@@ -1,5 +1,8 @@
 #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) {
   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);
diff --git a/card.h b/card.h
index 86cb1ad..76b6602 100644
--- a/card.h
+++ b/card.h
@@ -9,7 +9,6 @@ typedef struct Hand Hand;
 #define CARD_WIDTH 63
 #define CARD_HEIGHT 105
 #define CARD_BORDER 5
-static Vector2 card_size = (Vector2) { CARD_WIDTH, CARD_HEIGHT };
 
 typedef enum CardType {
   CHAFF,
@@ -40,8 +39,6 @@ typedef enum Month {
   DECEMBER
 } Month;
 
-static char *month_english_abbr[12] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
-
 struct Card {
   int index;
   CardType type;
@@ -57,5 +54,6 @@ struct Hand {
 };
 
 void draw_card(Card *c);
+bool point_within_card(Card *c, Vector2 v);
 
 #endif
diff --git a/dekiyaku.c b/dekiyaku.c
index 7c44241..6475888 100644
--- a/dekiyaku.c
+++ b/dekiyaku.c
@@ -1,3 +1,6 @@
+#include <string.h>
+#include <stdio.h>
+
 #include "dekiyaku.h"
 
 void calculate_dekiyaku(const Hand h, Dekiyaku *d) {
@@ -12,6 +15,7 @@ void calculate_dekiyaku(const Hand h, Dekiyaku *d) {
       switch (card.ribbon_type) {
       case RIBBON_BLUE: blue_ribbons++; break;
       case RIBBON_POETRY: poetry_ribbons++; break;
+      default: break;
       }
       break;
     case ANIMAL:
@@ -19,6 +23,7 @@ void calculate_dekiyaku(const Hand h, Dekiyaku *d) {
       case JUNE: butterflies++; break;
       case JULY: boar++; break;
       case OCTOBER: deer++; break;
+      default: break;
       }
       break;
     case CHAFF:
@@ -67,8 +72,6 @@ void calculate_dekiyaku(const Hand h, Dekiyaku *d) {
 
 char *meld_name(DekiyakuMeldType d) {
   switch (d) {
-  case NONE:
-    return "None";
   case FIVE_BRIGHTS:
     return "5B";
   case FOUR_BRIGHTS:
@@ -81,6 +84,8 @@ char *meld_name(DekiyakuMeldType d) {
     return "BS";
   case BOAR_DEER_BUTTERFLIES:
     return "ISK";
+  default:
+    return "None";
   }
 }
 
diff --git a/main.c b/main.c
index 81af2e7..584ddf8 100644
--- a/main.c
+++ b/main.c
@@ -69,16 +69,16 @@ int main(int argc, char** argv) {
       cards[i] = (Card) { i, t, rt, month, (Vector2) { month * 65, (i % 4) * 110 }, false };
     }
 
-    float delta;
-    Vector2 mouse_position;
+    // float delta;
+    Vector2 mouse_pos;
     char *teyaku_calculation = "";
     char dekiyaku_calculation[400];
 
     while (!WindowShouldClose()) {
-      delta = GetFrameTime();
+      // delta = GetFrameTime();
 
       if (IsMouseButtonPressed(0)) {
-	Vector2 mouse_pos = GetMousePosition();
+	mouse_pos = GetMousePosition();
 	for (int i = 0; i < 48; i++) {
 	  if (point_within_card(&cards[i], mouse_pos)) {
 	    cards[i].selected = !cards[i].selected;
diff --git a/move.c b/move.c
index e0a5d2f..7eed111 100644
--- a/move.c
+++ b/move.c
@@ -19,5 +19,7 @@ Vector2 move_position(Move *m, float delta) {
       ((m->destination.x - m->origin.x) * percentage) + m->origin.x,
       ((m->destination.y - m->origin.y) * percentage) + m->origin.y
     };
+  default:
+    return m->destination;
   }
 }