Merge branch 'master' into global-anims

diff --combined src/screens.c
index ab50316dc10ccc35cfd820ea20fd24629e21df9d,c45e9badb79740cadbf519c085d788bd2ad14f4d..97feee66acb6eeb9a44db9773e255011b628e869
--- 1/src/screens.c
--- 2/src/screens.c
+++ b/src/screens.c
@@@ -235,9 -235,6 +235,9 @@@ static TreeInfo *drop_distance_current 
  static TreeInfo *level_number = NULL;
  static TreeInfo *level_number_current = NULL;
  
 +static unsigned int sync_frame_delay = 0;
 +static unsigned int sync_frame_delay_value = GAME_FRAME_DELAY;
 +
  static struct
  {
    int value;
@@@ -329,11 -326,12 +329,12 @@@ static struc
    char *text;
  } snapshot_modes_list[] =
  {
-   {   STR_SNAPSHOT_MODE_OFF,          "Off"           },
-   {   STR_SNAPSHOT_MODE_EVERY_STEP,   "Every Step"    },
-   {   STR_SNAPSHOT_MODE_EVERY_MOVE,   "Every Move"    },
+   {   STR_SNAPSHOT_MODE_OFF,                  "Off"           },
+   {   STR_SNAPSHOT_MODE_EVERY_STEP,           "Every Step"    },
+   {   STR_SNAPSHOT_MODE_EVERY_MOVE,           "Every Move"    },
+   {   STR_SNAPSHOT_MODE_EVERY_COLLECT,        "Every Collect" },
  
-   {   NULL,                           NULL            },
+   {   NULL,                                   NULL            },
  };
  
  static struct
@@@ -5382,7 -5380,7 +5383,7 @@@ static struct TokenInfo setup_info_grap
    { TYPE_SWITCH,      &setup.quick_switch,    "Quick Player Focus Switch:" },
    { TYPE_SWITCH,      &setup.quick_doors,     "Quick Menu Doors:"     },
    { TYPE_SWITCH,      &setup.show_titlescreen,"Show Title Screens:"   },
 -  { TYPE_SWITCH,      &setup.toons,           "Show Toons:"           },
 +  { TYPE_SWITCH,      &setup.toons,           "Show Menu Animations:" },
    { TYPE_ECS_AGA,     &setup.prefer_aga_graphics,"EMC graphics preference:" },
    { TYPE_SWITCH, &setup.sp_show_border_elements,"Supaplex Border Elements:" },
    { TYPE_SWITCH,      &setup.small_game_graphics, "Small Game Graphics:" },
@@@ -5601,7 -5599,8 +5602,7 @@@ static Key getSetupKey(
      DoAnimation();
      BackToFront();
  
 -    /* don't eat all CPU time */
 -    Delay(10);
 +    WaitUntilDelayReached(&sync_frame_delay, sync_frame_delay_value);
    }
  
    return key;
@@@ -6288,7 -6287,8 +6289,7 @@@ void CustomizeKeyboard(int player_nr
      DoAnimation();
      BackToFront();
  
 -    /* don't eat all CPU time */
 -    Delay(10);
 +    WaitUntilDelayReached(&sync_frame_delay, sync_frame_delay_value);
    }
  
    /* write new key bindings back to player setup */
@@@ -6443,7 -6443,8 +6444,7 @@@ static boolean CalibrateJoystickMain(in
      DoAnimation();
      BackToFront();
  
 -    /* don't eat all CPU time */
 -    Delay(10);
 +    WaitUntilDelayReached(&sync_frame_delay, sync_frame_delay_value);
    }
  
    /* calibrated center position (joystick should now be centered) */
@@@ -6465,7 -6466,7 +6466,7 @@@
        NextEvent(&event);
        HandleOtherEvents(&event);
  
 -      Delay(10);
 +      WaitUntilDelayReached(&sync_frame_delay, sync_frame_delay_value);
      }
    }