Skip to content

Commit 4e6fceb

Browse files
committed
Solitaire fix: game allowed to place ♠3 on the top row when there was no card there.
Updated builds to the latest stable firmware releases
1 parent f907b35 commit 4e6fceb

File tree

5 files changed

+3
-2
lines changed

5 files changed

+3
-2
lines changed

builds/unleashed_blackjack.fap

0 Bytes
Binary file not shown.

builds/unleashed_solitaire.fap

-132 Bytes
Binary file not shown.

builds/vanilla_blackjack.fap

0 Bytes
Binary file not shown.

builds/vanilla_solitaire.fap

-132 Bytes
Binary file not shown.

solitaire/solitaire.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ int8_t columns[7][3] = {
3434
};
3535

3636
bool can_place_card(Card where, Card what) {
37-
FURI_LOG_D(APP_NAME, "TESTING pip %i, letter %i with pip %i, letter %i", where.pip, where.character, what.pip,
38-
what.character);
3937
bool a_black = where.pip == 0 || where.pip == 3;
4038
bool b_black = what.pip == 0 || what.pip == 3;
4139
if (a_black == b_black) return false;
@@ -225,6 +223,9 @@ bool place_on_top(Card *where, Card what) {
225223
int8_t b_letter = (int8_t) what.character;
226224
if (a_letter == 12) a_letter = -1;
227225
if (b_letter == 12) b_letter = -1;
226+
if(where->disabled && b_letter!=-1)
227+
return false;
228+
228229
if ((a_letter + 1) == b_letter) {
229230
where->disabled = what.disabled;
230231
where->pip = what.pip;

0 commit comments

Comments
 (0)