big release

Author: doofy-dev

blackjack/application.fam

@@ -4,7 +4,7 @@ App(
     apptype=FlipperAppType.EXTERNAL,
     entry_point="blackjack_app",
     cdefines=["APP_BLACKJACK"],
-    requires=["gui","storage"],
+    requires=["gui","storage","canvas"],
     stack_size=2 * 1024,
     order=30,
     fap_icon="blackjack_10px.png",

blackjack/blackjack.c

@@ -3,6 +3,8 @@
 #include <stdlib.h>
 #include <dolphin/dolphin.h>
 #include <dialogs/dialogs.h>
+#include <gui/canvas_i.h>
+
 #include <math.h>
 #include "util.h"
 #include "defines.h"

builds/unleashed_blackjack.fap

@@ -239,6 +239,9 @@ int first_non_flipped_card(Hand hand) {
 void draw_hand_column(Hand hand, int16_t pos_x, int16_t pos_y, int8_t highlight, Canvas *const canvas) {
     if (hand.index == 0) {
         draw_card_space(pos_x, pos_y, highlight > 0, canvas);
+        if(highlight==0)
+            draw_rounded_box(canvas, pos_x, pos_y, CARD_WIDTH, CARD_HEIGHT,
+                             Inverse);
         return;
     }
 
@@ -275,6 +278,9 @@ void draw_hand_column(Hand hand, int16_t pos_x, int16_t pos_y, int8_t highlight,
     for (int i = hStart; i < loopEnd; i++, pos+=4) {
         if (hand.cards[i].flipped) {
             draw_card_back_at(pos_x, pos_y + pos, canvas);
+            if(i==highlight)
+            draw_rounded_box(canvas, pos_x+1, pos_y + pos+1, CARD_WIDTH - 2, CARD_HEIGHT - 2,
+                             Inverse);
         } else {
             draw_card_at_colored(pos_x, pos_y + pos, hand.cards[i].pip, hand.cards[i].character,
                                  (i == highlight),

builds/unleashed_solitaire.fap

@@ -68,13 +68,14 @@ bool test_pixel(uint8_t *data, uint8_t x, uint8_t y, uint8_t w) {
 }
 
 uint8_t* get_buffer(Canvas *const canvas){
-    return canvas_get_buffer(canvas);
+    return canvas->fb.tile_buf_ptr;
+  //  return canvas_get_buffer(canvas);
 }
 uint8_t* make_buffer(){
-    return malloc(sizeof(uint8_t) * 8 * 126);
+    return malloc(sizeof(uint8_t) * 8 * 128);
 }
 void clone_buffer(uint8_t* canvas, uint8_t* data){
-    for(int i=0;i<1008;i++){
+    for(int i=0;i<1024;i++){
         data[i]= canvas[i];
     }
 }
@@ -165,7 +166,7 @@ void invert_rectangle(Canvas *const canvas, int16_t x, int16_t y, uint8_t w, uin
 }
 
 uint8_t *image_data(Canvas *const canvas, const Icon *icon) {
-    uint8_t *data = malloc(sizeof(uint8_t) * 8 * 126);
+    uint8_t *data = malloc(sizeof(uint8_t) * 8 * 128);
     uint8_t *screen = canvas->fb.tile_buf_ptr;
     canvas->fb.tile_buf_ptr = data;
     canvas_draw_icon(canvas, 0, 0, icon);

builds/vanilla_blackjack.fap

@@ -53,6 +53,6 @@ void draw_line(Canvas *const canvas, int16_t x1, int16_t y1, int16_t x2, int16_t
 bool in_screen(int16_t x, int16_t y);
 
 void ui_cleanup();
-
+uint8_t* get_buffer(Canvas *const canvas);
 uint8_t* make_buffer();
 void clone_buffer(uint8_t* canvas, uint8_t* data);

builds/vanilla_solitaire.fap

@@ -31,8 +31,8 @@ typedef struct {
     Card card;
     int8_t deck;
     int indexes[4];
-    int8_t x;
-    int8_t y;
+    float x;
+    float y;
     float vx;
     float vy;
     bool started;