X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fscreens.c;h=97feee66acb6eeb9a44db9773e255011b628e869;hp=a9448442cefcc3ffb3e47c695885da6624a46849;hb=f78f30b84a0345ea31b30c5bd95e338c9d9ebd4b;hpb=61f3e4384807556f36acba1388e4b5535c583c13

diff --git a/src/screens.c b/src/screens.c
index a9448442..97feee66 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -235,6 +235,9 @@ static TreeInfo *drop_distance_current = NULL;
 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;
@@ -326,11 +329,12 @@ static struct
   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
@@ -1566,6 +1570,9 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
     {
       if (num_title_screens == 0)
       {
+	/* switch game mode from title screen mode back to info screen mode */
+	game_status = GAME_MODE_INFO;
+
 	DrawInfoScreen_NotAvailable("Title screen information:",
 				    "No title screen for this level set.");
 
@@ -5376,7 +5383,7 @@ static struct TokenInfo setup_info_graphics[] =
   { 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:" },
@@ -5595,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;
@@ -6283,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 */
@@ -6439,8 +6444,7 @@ static boolean CalibrateJoystickMain(int player_nr)
     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) */
@@ -6462,7 +6466,7 @@ static boolean CalibrateJoystickMain(int player_nr)
       NextEvent(&event);
       HandleOtherEvents(&event);
 
-      Delay(10);
+      WaitUntilDelayReached(&sync_frame_delay, sync_frame_delay_value);
     }
   }