xtruan 2 лет назад
Родитель
Сommit
c326539e2f
5 измененных файлов с 637 добавлено и 670 удалено
  1. 607 636
      chess/smallchesslib.h
  2. 6 3
      flipchess.c
  3. 1 4
      flipchess.h
  4. 1 5
      scenes/flipchess_scene_menu.c
  5. 22 22
      views/flipchess_scene_1.c

Разница между файлами не показана из-за своего большого размера
+ 607 - 636
chess/smallchesslib.h


+ 6 - 3
flipchess.c

@@ -32,7 +32,7 @@ static void text_input_callback(void* context) {
                 strcpy(app->import_game_text, app->input_text);
 
                 int status = FlipChessStatusSuccess;
-                
+
                 if(status == FlipChessStatusSuccess) {
                     //notification_message(app->notification, &sequence_blink_cyan_100);
                     flipchess_play_happy_bump(app);
@@ -73,7 +73,8 @@ FlipChess* flipchess_app_alloc() {
         app->view_dispatcher, flipchess_navigation_event_callback);
     view_dispatcher_set_tick_event_callback(
         app->view_dispatcher, flipchess_tick_event_callback, 100);
-    view_dispatcher_set_custom_event_callback(app->view_dispatcher, flipchess_custom_event_callback);
+    view_dispatcher_set_custom_event_callback(
+        app->view_dispatcher, flipchess_custom_event_callback);
     app->submenu = submenu_alloc();
 
     // Settings
@@ -96,7 +97,9 @@ FlipChess* flipchess_app_alloc() {
         flipchess_startscreen_get_view(app->flipchess_startscreen));
     app->flipchess_scene_1 = flipchess_scene_1_alloc();
     view_dispatcher_add_view(
-        app->view_dispatcher, FlipChessViewIdScene1, flipchess_scene_1_get_view(app->flipchess_scene_1));
+        app->view_dispatcher,
+        FlipChessViewIdScene1,
+        flipchess_scene_1_get_view(app->flipchess_scene_1));
     app->variable_item_list = variable_item_list_alloc();
     view_dispatcher_add_view(
         app->view_dispatcher,

+ 1 - 4
flipchess.h

@@ -61,10 +61,7 @@ typedef enum {
     FlipChessPlayerAI3 = 3,
 } FlipChessPlayerMode;
 
-typedef enum {
-    FlipChessTextInputDefault,
-    FlipChessTextInputGame
-} FlipChessTextInputState;
+typedef enum { FlipChessTextInputDefault, FlipChessTextInputGame } FlipChessTextInputState;
 
 typedef enum {
     FlipChessStatusSuccess = 0,

+ 1 - 5
scenes/flipchess_scene_menu.c

@@ -29,11 +29,7 @@ void flipchess_scene_menu_on_enter(void* context) {
     //     app);
 
     submenu_add_item(
-        app->submenu, 
-        "Settings", 
-        SubmenuIndexSettings, 
-        flipchess_scene_menu_submenu_callback, 
-        app);
+        app->submenu, "Settings", SubmenuIndexSettings, flipchess_scene_menu_submenu_callback, app);
 
     submenu_set_selected_item(
         app->submenu, scene_manager_get_scene_state(app->scene_manager, FlipChessSceneMenu));

+ 22 - 22
views/flipchess_scene_1.c

@@ -138,7 +138,7 @@ int16_t flipchess_makeAIMove(
 
 bool flipchess_isPlayerTurn(FlipChessScene1Model* model) {
     return (SCL_boardWhitesTurn(model->game.board) && model->paramPlayerW == 0) ||
-       (!SCL_boardWhitesTurn(model->game.board) && model->paramPlayerB == 0);
+           (!SCL_boardWhitesTurn(model->game.board) && model->paramPlayerB == 0);
 }
 
 void flipchess_shiftMessages(FlipChessScene1Model* model) {
@@ -164,7 +164,7 @@ uint8_t flipchess_turn(FlipChessScene1Model* model) {
     uint8_t moveType = 0;
 
     // if(model->paramInfo) {
-        
+
     //     if(model->random960PosNumber >= 0)
     //         printf("960 random position number: %d\n", model->random960PosNumber);
 
@@ -214,16 +214,15 @@ uint8_t flipchess_turn(FlipChessScene1Model* model) {
     char movePromote = 'q';
 
     if(flipchess_isPlayerTurn(model)) {
-        
         // if(stringsEqual(string, "undo", 5))
         //     moveType = 3;
         // else if(stringsEqual(string, "quit", 5))
         //     break;
-        
-        if (model->turnState == 0 && model->squareSelected != 255) {
+
+        if(model->turnState == 0 && model->squareSelected != 255) {
             model->squareFrom = model->squareSelected;
             model->turnState = 1;
-        } else if (model->turnState == 1 && model->squareSelected != 255) {
+        } else if(model->turnState == 1 && model->squareSelected != 255) {
             model->squareTo = model->squareSelected;
             model->turnState = 2;
             model->squareSelectedLast = model->squareSelected;
@@ -236,14 +235,14 @@ uint8_t flipchess_turn(FlipChessScene1Model* model) {
                 SCL_boardWhitesTurn(model->game.board))) {
                 SCL_boardGetMoves(model->game.board, model->squareFrom, model->moveHighlight);
             }
-        } else if (model->turnState == 2) {
+        } else if(model->turnState == 2) {
             if(SCL_squareSetContains(model->moveHighlight, model->squareTo)) {
                 moveType = 1;
             }
             model->turnState = 0;
             SCL_squareSetClear(model->moveHighlight);
         }
-        
+
     } else {
         model->squareSelected = 255;
         flipchess_makeAIMove(
@@ -310,7 +309,8 @@ uint8_t flipchess_turn(FlipChessScene1Model* model) {
 
     default:
         if(model->game.ply > 0) {
-            model->msg = (SCL_boardWhitesTurn(model->game.board) ? "black played" : "white played");
+            model->msg =
+                (SCL_boardWhitesTurn(model->game.board) ? "black played" : "white played");
 
             uint8_t s0, s1;
             char p;
@@ -493,7 +493,7 @@ bool flipchess_scene_1_input(InputEvent* event, void* context) {
                 instance->view,
                 FlipChessScene1Model * model,
                 {
-                    if (model->squareSelectedLast != 255 && model->squareSelected == 255) {
+                    if(model->squareSelectedLast != 255 && model->squareSelected == 255) {
                         model->squareSelected = model->squareSelectedLast;
                     } else {
                         model->squareSelected = (model->squareSelected + 1) % 64;
@@ -507,7 +507,7 @@ bool flipchess_scene_1_input(InputEvent* event, void* context) {
                 instance->view,
                 FlipChessScene1Model * model,
                 {
-                    if (model->squareSelectedLast != 255 && model->squareSelected == 255) {
+                    if(model->squareSelectedLast != 255 && model->squareSelected == 255) {
                         model->squareSelected = model->squareSelectedLast;
                     } else {
                         model->squareSelected = (model->squareSelected + 56) % 64;
@@ -521,7 +521,7 @@ bool flipchess_scene_1_input(InputEvent* event, void* context) {
                 instance->view,
                 FlipChessScene1Model * model,
                 {
-                    if (model->squareSelectedLast != 255 && model->squareSelected == 255) {
+                    if(model->squareSelectedLast != 255 && model->squareSelected == 255) {
                         model->squareSelected = model->squareSelectedLast;
                     } else {
                         model->squareSelected = (model->squareSelected + 63) % 64;
@@ -534,7 +534,8 @@ bool flipchess_scene_1_input(InputEvent* event, void* context) {
             with_view_model(
                 instance->view,
                 FlipChessScene1Model * model,
-                {if (model->squareSelectedLast != 255 && model->squareSelected == 255) {
+                {
+                    if(model->squareSelectedLast != 255 && model->squareSelected == 255) {
                         model->squareSelected = model->squareSelectedLast;
                     } else {
                         model->squareSelected = (model->squareSelected + 8) % 64;
@@ -545,23 +546,23 @@ bool flipchess_scene_1_input(InputEvent* event, void* context) {
             break;
         case InputKeyOk:
             with_view_model(
-                instance->view, FlipChessScene1Model * model, 
+                instance->view,
+                FlipChessScene1Model * model,
                 {
-                    if (model->paramExit == FlipChessStatusReturn) {
+                    if(model->paramExit == FlipChessStatusReturn) {
                         instance->callback(FlipChessCustomEventScene1Back, instance->context);
                         break;
                     }
                     // first turn of round, probably player but could be AI
                     flipchess_turn(model);
                     flipchess_drawBoard(model);
-                    
+
                     // if player played, let AI play
-                    if (!flipchess_isPlayerTurn(model))
-                    {
+                    if(!flipchess_isPlayerTurn(model)) {
                         flipchess_turn(model);
                         flipchess_drawBoard(model);
-                                            }
-                }, 
+                    }
+                },
                 true);
             break;
         case InputKeyMAX:
@@ -591,8 +592,7 @@ void flipchess_scene_1_enter(void* context) {
         instance->view,
         FlipChessScene1Model * model,
         {
-            int init =
-                flipchess_scene_1_model_init(model, app->white_mode, app->black_mode);
+            int init = flipchess_scene_1_model_init(model, app->white_mode, app->black_mode);
 
             // nonzero status
             if(init == FlipChessStatusSuccess) {

Некоторые файлы не были показаны из-за большого количества измененных файлов