Willy-JL 1 год назад
Родитель
Сommit
a6a1a38a52
1 измененных файлов с 24 добавлено и 13 удалено
  1. 24 13
      umpire_indicator/umpire_indicator.c

+ 24 - 13
umpire_indicator/umpire_indicator.c

@@ -29,7 +29,7 @@ void draw_instructions(Canvas* canvas) {
     canvas_clear(canvas);
     canvas_clear(canvas);
     canvas_set_font(canvas, FontPrimary);
     canvas_set_font(canvas, FontPrimary);
     canvas_draw_str(canvas, 2, 12, "Umpire Indicator");
     canvas_draw_str(canvas, 2, 12, "Umpire Indicator");
-    
+
     canvas_set_font(canvas, FontSecondary);
     canvas_set_font(canvas, FontSecondary);
     canvas_draw_str(canvas, 2, 24, "Left: Ball   Up: Strike");
     canvas_draw_str(canvas, 2, 24, "Left: Ball   Up: Strike");
     canvas_draw_str(canvas, 2, 34, "Right: Out   Down: Undo");
     canvas_draw_str(canvas, 2, 34, "Right: Out   Down: Undo");
@@ -68,16 +68,22 @@ void draw_counter(Canvas* canvas, UmpireIndicatorState* state) {
     // Draw indicator circles
     // Draw indicator circles
     canvas_set_font(canvas, FontSecondary);
     canvas_set_font(canvas, FontSecondary);
     for(int i = 0; i < 4; i++) {
     for(int i = 0; i < 4; i++) {
-        if(i < state->balls) canvas_draw_disc(canvas, ball_x + 2 + (i * 9), box_y + box_height + 4, 3);
-        else canvas_draw_circle(canvas, ball_x + 2 + (i * 9), box_y + box_height + 4, 3);
+        if(i < state->balls)
+            canvas_draw_disc(canvas, ball_x + 2 + (i * 9), box_y + box_height + 4, 3);
+        else
+            canvas_draw_circle(canvas, ball_x + 2 + (i * 9), box_y + box_height + 4, 3);
     }
     }
     for(int i = 0; i < 3; i++) {
     for(int i = 0; i < 3; i++) {
-        if(i < state->strikes) canvas_draw_disc(canvas, strike_x + 2 + (i * 12), box_y + box_height + 4, 3);
-        else canvas_draw_circle(canvas, strike_x + 2 + (i * 12), box_y + box_height + 4, 3);
+        if(i < state->strikes)
+            canvas_draw_disc(canvas, strike_x + 2 + (i * 12), box_y + box_height + 4, 3);
+        else
+            canvas_draw_circle(canvas, strike_x + 2 + (i * 12), box_y + box_height + 4, 3);
     }
     }
     for(int i = 0; i < 3; i++) {
     for(int i = 0; i < 3; i++) {
-        if(i < state->outs) canvas_draw_disc(canvas, out_x + 2 + (i * 12), box_y + box_height + 4, 3);
-        else canvas_draw_circle(canvas, out_x + 2 + (i * 12), box_y + box_height + 4, 3);
+        if(i < state->outs)
+            canvas_draw_disc(canvas, out_x + 2 + (i * 12), box_y + box_height + 4, 3);
+        else
+            canvas_draw_circle(canvas, out_x + 2 + (i * 12), box_y + box_height + 4, 3);
     }
     }
 }
 }
 
 
@@ -115,7 +121,8 @@ void input_callback(InputEvent* input_event, void* ctx) {
                 if(state->strikes == 3) {
                 if(state->strikes == 3) {
                     state->strikes = 0;
                     state->strikes = 0;
                     state->balls = 0;
                     state->balls = 0;
-                    if(state->outs < 2) state->outs++;
+                    if(state->outs < 2)
+                        state->outs++;
                     else {
                     else {
                         state->outs = 0;
                         state->outs = 0;
                     }
                     }
@@ -124,7 +131,8 @@ void input_callback(InputEvent* input_event, void* ctx) {
             break;
             break;
         case InputKeyRight:
         case InputKeyRight:
             if(state->state == StateCounter) {
             if(state->state == StateCounter) {
-                if(state->outs < 2) state->outs++;
+                if(state->outs < 2)
+                    state->outs++;
                 else {
                 else {
                     state->outs = 0;
                     state->outs = 0;
                     state->balls = 0;
                     state->balls = 0;
@@ -134,9 +142,12 @@ void input_callback(InputEvent* input_event, void* ctx) {
             break;
             break;
         case InputKeyDown:
         case InputKeyDown:
             if(state->state == StateCounter) {
             if(state->state == StateCounter) {
-                if(state->balls > 0) state->balls--;
-                else if(state->strikes > 0) state->strikes--;
-                else if(state->outs > 0) state->outs--;
+                if(state->balls > 0)
+                    state->balls--;
+                else if(state->strikes > 0)
+                    state->strikes--;
+                else if(state->outs > 0)
+                    state->outs--;
             }
             }
             break;
             break;
         case InputKeyBack:
         case InputKeyBack:
@@ -183,4 +194,4 @@ int32_t umpire_indicator_app(void* p) {
     free(state);
     free(state);
 
 
     return 0;
     return 0;
-}
+}