Merge remote-tracking branch 'upstream/main'

And add NULL Acrobat Joker effect
2025-10-07 20:18:41 +02:00
parent 0cfe0e5126 22ddd83931
commit 8cd86f1640
7 changed files with 232 additions and 15 deletions
@@ -157,7 +157,7 @@ void joker_destroy(Joker **joker)
 JokerEffect joker_get_score_effect(Joker *joker, Card *scored_card)
 {
    const JokerInfo *jinfo = get_joker_registry_entry(joker->id);
-    if (!jinfo) return (JokerEffect){0};
+    if (!jinfo || jinfo->effect == NULL) return (JokerEffect){0};

    return jinfo->effect(joker, scored_card);
 }