Extracted JokerObject and CardObject common functionalities to SpriteObject, removing duplicate code and dangerous casts.

source/card.c

@@ -64,20 +64,7 @@ CardObject *card_object_new(Card *card)
     CardObject *card_object = malloc(sizeof(CardObject));
 
     card_object->card = card;
-    card_object->sprite = NULL;
-    card_object->tx = 0; // Target position
-    card_object->ty = 0;
-    card_object->x = 0;
-    card_object->y = 0;
-    card_object->vx = 0;
-    card_object->vy = 0;
-    card_object->tscale = float2fx(1.0f); // Target scale
-    card_object->scale = float2fx(1.0f);
-    card_object->vscale = float2fx(0.0f);
-    card_object->trotation = 0; // Target rotation
-    card_object->rotation = 0;
-    card_object->vrotation = 0;
-    card_object->selected = false;
+    card_object->sprite_object = sprite_object_new();
 
     return card_object;
 }
@@ -85,83 +72,47 @@ CardObject *card_object_new(Card *card)
 void card_object_destroy(CardObject **card_object)
 {
     if (*card_object == NULL) return;
-    sprite_destroy(&(*card_object)->sprite);
+    sprite_object_destroy(&((*card_object)->sprite_object));
     //card_destroy(&(*card_object)->card); // In practice, this is unnecessary because the card will be inserted into the discard pile and then back into the deck. If you need to destroy the card, you can do it manually before calling this function.
     free(*card_object);
     *card_object = NULL;
 }
 
-void card_object_update(CardObject *card_object)
+void card_object_update(CardObject* card_object)
 {
-    card_object->vx += (card_object->tx - card_object->x) / 8;
-    card_object->vy += (card_object->ty - card_object->y) / 8;
-
-    card_object->vscale += (card_object->tscale - card_object->scale) / 8; // Scale up the card when it's played
-
-    card_object->vrotation += (card_object->trotation - card_object->rotation) / 8; // Rotate the card when it's played
-
-    // set velocity to 0 if it's close enough to the target
-    const float epsilon = float2fx(0.01f);
-    if (card_object->vx < epsilon && card_object->vx > -epsilon && card_object->vy < epsilon && card_object->vy > -epsilon)
-    {
-        card_object->vx = 0;
-        card_object->vy = 0;
-
-        card_object->x = card_object->tx;
-        card_object->y = card_object->ty;
-    }
-    else
-    {
-        card_object->vx = (card_object->vx * 7) / 10;
-        card_object->vy = (card_object->vy * 7) / 10;
-
-        card_object->x += card_object->vx;
-        card_object->y += card_object->vy;
-    }
-
-     // Set scale to 0 if it's close enough to the target
-    if (card_object->vscale < epsilon && card_object->vscale > -epsilon)
-    {
-        card_object->vscale = 0;
-        card_object->scale = card_object->tscale; // Set the scale to the target scale
-    }
-    else
-    {
-        card_object->vscale = (card_object->vscale * 7) / 10;
-        card_object->scale += card_object->vscale;
-    }
-
-    // Set rotation to 0 if it's close enough to the target
-    if (card_object->vrotation < epsilon && card_object->vrotation > -epsilon)
-    {
-        card_object->vrotation = 0;
-        card_object->rotation = card_object->trotation; // Set the rotation to the target rotation
-    }
-    else
-    {
-        card_object->vrotation = (card_object->vrotation * 7) / 10;
-        card_object->rotation += card_object->vrotation;
-    }
-
-    obj_aff_rotscale(card_object->sprite->aff, card_object->scale, card_object->scale, -card_object->vx + card_object->rotation); // Apply rotation and scale to the sprite
-    sprite_position(card_object->sprite, fx2int(card_object->x), fx2int(card_object->y));
+    if (card_object == NULL) return;
+    sprite_object_update(card_object->sprite_object);
 }
 
 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_destroy(&card_object->sprite); // Destroy the old sprite if it exists
-    card_object->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_new(ATTR0_SQUARE | ATTR0_4BPP | ATTR0_AFF, ATTR1_SIZE_32, tile_index, 0, layer + CARD_STARTING_LAYER));
 }
 
-void card_object_shake(CardObject *card_object, mm_word sound_id)
+void card_object_shake(CardObject* card_object, mm_word sound_id)
 {
-    card_object->vscale = float2fx(0.3f); // Scale down the card when it's scored
-    card_object->vrotation = float2fx(8.0f); // Rotate the card when it's scored
+    sprite_object_shake(card_object->sprite_object, sound_id);
+}
 
-    if (sound_id == -1) return; // If no sound ID is provided, do nothing
+void card_object_set_selected(CardObject* card_object, bool selected)
+{
+    if (card_object == NULL)
+        return;
+    sprite_object_set_selected(card_object->sprite_object, selected);
+}
 
-    mm_sound_effect sfx_select = {{sound_id}, 1024, 0, 255, 128,};
-    mmEffectEx(&sfx_select);
+bool card_object_is_selected(CardObject* card_object)
+{
+    if (card_object == NULL)
+        return false;
+    return sprite_object_is_selected(card_object->sprite_object);
+}
+
+Sprite* card_object_get_sprite(CardObject* card_object)
+{
+    if (card_object == NULL)
+        return NULL;
+    return sprite_object_get_sprite(card_object->sprite_object);
 }