X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=87f4a3e0ee124af6f93583f740b77695dc80ba26;hb=949580a3bafe5c8abd1fac99202411b65900b883;hp=884854e53c03679e30d66c8c9896c108365168e0;hpb=91c0172a97f1323e573684a456de436332c8ea34;p=rocksndiamonds.git

diff --git a/src/screens.c b/src/screens.c
index 884854e5..87f4a3e0 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -45,22 +45,25 @@
 #define SETUP_MODE_SOUND		4
 #define SETUP_MODE_ARTWORK		5
 #define SETUP_MODE_INPUT		6
-#define SETUP_MODE_SHORTCUTS_1		7
-#define SETUP_MODE_SHORTCUTS_2		8
+#define SETUP_MODE_SHORTCUTS		7
+#define SETUP_MODE_SHORTCUTS_1		8
+#define SETUP_MODE_SHORTCUTS_2		9
+#define SETUP_MODE_SHORTCUTS_3		10
+#define SETUP_MODE_SHORTCUTS_4		11
 
 /* sub-screens on the setup screen (generic) */
-#define SETUP_MODE_CHOOSE_ARTWORK	9
-#define SETUP_MODE_CHOOSE_OTHER		10
+#define SETUP_MODE_CHOOSE_ARTWORK	12
+#define SETUP_MODE_CHOOSE_OTHER		13
 
 /* sub-screens on the setup screen (specific) */
-#define SETUP_MODE_CHOOSE_GAME_SPEED	11
-#define SETUP_MODE_CHOOSE_SCREEN_MODE	12
-#define SETUP_MODE_CHOOSE_SCROLL_DELAY	13
-#define SETUP_MODE_CHOOSE_GRAPHICS	14
-#define SETUP_MODE_CHOOSE_SOUNDS	15
-#define SETUP_MODE_CHOOSE_MUSIC		16
+#define SETUP_MODE_CHOOSE_GAME_SPEED	14
+#define SETUP_MODE_CHOOSE_SCREEN_MODE	15
+#define SETUP_MODE_CHOOSE_SCROLL_DELAY	16
+#define SETUP_MODE_CHOOSE_GRAPHICS	17
+#define SETUP_MODE_CHOOSE_SOUNDS	18
+#define SETUP_MODE_CHOOSE_MUSIC		19
 
-#define MAX_SETUP_MODES			17
+#define MAX_SETUP_MODES			20
 
 /* for input setup functions */
 #define SETUPINPUT_SCREEN_POS_START	0
@@ -232,7 +235,7 @@ static struct
 				 INFO_MODE_MAIN)
 
 #define DRAW_MODE_SETUP(i)	((i) >= SETUP_MODE_MAIN &&		\
-				 (i) <= SETUP_MODE_SHORTCUTS_2 ? (i) :	\
+				 (i) <= SETUP_MODE_SHORTCUTS_4 ? (i) :	\
 				 (i) >= SETUP_MODE_CHOOSE_GRAPHICS &&	\
 				 (i) <= SETUP_MODE_CHOOSE_MUSIC ?	\
 				 SETUP_MODE_CHOOSE_ARTWORK :		\
@@ -757,10 +760,12 @@ static void InitializeTitleControls(boolean show_title_initial)
   num_title_screens = 0;
 
 #if 1
+  /* 1st step: initialize title screens for game start (only when starting) */
   if (show_title_initial)
     InitializeTitleControls_CheckTitleInfo(TRUE);
 #endif
 
+  /* 2nd step: initialize title screens for current level set */
   InitializeTitleControls_CheckTitleInfo(FALSE);
 
   /* sort title screens according to sort_priority and title number */
@@ -4079,6 +4084,13 @@ static void execSetupInput()
   DrawSetupScreen();
 }
 
+static void execSetupShortcuts()
+{
+  setup_mode = SETUP_MODE_SHORTCUTS;
+
+  DrawSetupScreen();
+}
+
 static void execSetupShortcuts1()
 {
   setup_mode = SETUP_MODE_SHORTCUTS_1;
@@ -4093,6 +4105,20 @@ static void execSetupShortcuts2()
   DrawSetupScreen();
 }
 
+static void execSetupShortcuts3()
+{
+  setup_mode = SETUP_MODE_SHORTCUTS_3;
+
+  DrawSetupScreen();
+}
+
+static void execSetupShortcuts4()
+{
+  setup_mode = SETUP_MODE_SHORTCUTS_4;
+
+  DrawSetupScreen();
+}
+
 static void execExitSetup()
 {
   game_status = GAME_MODE_MAIN;
@@ -4114,8 +4140,7 @@ static struct TokenInfo setup_info_main[] =
   { TYPE_ENTER_MENU,	execSetupSound,		"Sound & Music"		},
   { TYPE_ENTER_MENU,	execSetupArtwork,	"Custom Artwork"	},
   { TYPE_ENTER_MENU,	execSetupInput,		"Input Devices"		},
-  { TYPE_ENTER_MENU,	execSetupShortcuts1,	"Key Shortcuts 1"	},
-  { TYPE_ENTER_MENU,	execSetupShortcuts2,	"Key Shortcuts 2"	},
+  { TYPE_ENTER_MENU,	execSetupShortcuts,	"Key Shortcuts"		},
   { TYPE_EMPTY,		NULL,			""			},
   { TYPE_LEAVE_MENU,	execExitSetup, 		"Exit"			},
   { TYPE_LEAVE_MENU,	execSaveAndExitSetup,	"Save and Exit"		},
@@ -4191,6 +4216,7 @@ static struct TokenInfo setup_info_graphics[] =
   { TYPE_SWITCH,	&setup.show_titlescreen,"Show Title Screens:"	},
   { TYPE_SWITCH,	&setup.toons,		"Show Toons:"		},
   { TYPE_ECS_AGA,	&setup.prefer_aga_graphics,"EMC graphics preference:" },
+  { TYPE_SWITCH, &setup.sp_show_border_elements,"Supaplex Border Elements:" },
   { TYPE_EMPTY,		NULL,			""			},
   { TYPE_LEAVE_MENU,	execSetupMain, 		"Back"			},
 
@@ -4260,6 +4286,18 @@ static struct TokenInfo setup_info_input[] =
   { 0,			NULL,			NULL			}
 };
 
+static struct TokenInfo setup_info_shortcuts[] =
+{
+  { TYPE_ENTER_MENU,	execSetupShortcuts1,	"Various Keys"	},
+  { TYPE_ENTER_MENU,	execSetupShortcuts2,	"Player Focus"	},
+  { TYPE_ENTER_MENU,	execSetupShortcuts3,	"Tape Buttons"	},
+  { TYPE_ENTER_MENU,	execSetupShortcuts4,	"Sound & Music"	},
+  { TYPE_EMPTY,		NULL,			""			},
+  { TYPE_LEAVE_MENU,	execSetupMain, 		"Back"			},
+
+  { 0,			NULL,			NULL			}
+};
+
 static struct TokenInfo setup_info_shortcuts_1[] =
 {
   { TYPE_KEYTEXT,	NULL,		"Quick Save Game to Tape:",	},
@@ -4272,7 +4310,7 @@ static struct TokenInfo setup_info_shortcuts_1[] =
   { TYPE_YES_NO,	&setup.ask_on_escape,	"Ask on 'Esc' Key:"	},
   { TYPE_YES_NO, &setup.ask_on_escape_editor,	"Ask on 'Esc' Key (Editor):" },
   { TYPE_EMPTY,		NULL,			""			},
-  { TYPE_LEAVE_MENU,	execSetupMain, 		"Back"			},
+  { TYPE_LEAVE_MENU,	execSetupShortcuts,	"Back"			},
 
   { 0,			NULL,			NULL			}
 };
@@ -4290,7 +4328,39 @@ static struct TokenInfo setup_info_shortcuts_2[] =
   { TYPE_KEYTEXT,	NULL,		"Set Focus to All Players:",	},
   { TYPE_KEY,		&setup.shortcut.focus_player_all, ""		},
   { TYPE_EMPTY,		NULL,			""			},
-  { TYPE_LEAVE_MENU,	execSetupMain, 		"Back"			},
+  { TYPE_LEAVE_MENU,	execSetupShortcuts,	"Back"			},
+
+  { 0,			NULL,			NULL			}
+};
+
+static struct TokenInfo setup_info_shortcuts_3[] =
+{
+  { TYPE_KEYTEXT,	NULL,			"Tape Eject:",		},
+  { TYPE_KEY,		&setup.shortcut.tape_eject, ""			},
+  { TYPE_KEYTEXT,	NULL,			"Tape Stop:",		},
+  { TYPE_KEY,		&setup.shortcut.tape_stop, ""			},
+  { TYPE_KEYTEXT,	NULL,			"Tape Pause:",		},
+  { TYPE_KEY,		&setup.shortcut.tape_pause, ""			},
+  { TYPE_KEYTEXT,	NULL,			"Tape Record:",		},
+  { TYPE_KEY,		&setup.shortcut.tape_record, ""			},
+  { TYPE_KEYTEXT,	NULL,			"Tape Play:",		},
+  { TYPE_KEY,		&setup.shortcut.tape_play, ""			},
+  { TYPE_EMPTY,		NULL,			""			},
+  { TYPE_LEAVE_MENU,	execSetupShortcuts,	"Back"			},
+
+  { 0,			NULL,			NULL			}
+};
+
+static struct TokenInfo setup_info_shortcuts_4[] =
+{
+  { TYPE_KEYTEXT,	NULL,		"Sound Effects (Normal):",	},
+  { TYPE_KEY,		&setup.shortcut.sound_simple, ""		},
+  { TYPE_KEYTEXT,	NULL,		"Sound Effects (Looping):",	},
+  { TYPE_KEY,		&setup.shortcut.sound_loops, ""			},
+  { TYPE_KEYTEXT,	NULL,		"Music:",			},
+  { TYPE_KEY,		&setup.shortcut.sound_music, ""			},
+  { TYPE_EMPTY,		NULL,			""			},
+  { TYPE_LEAVE_MENU,	execSetupShortcuts,	"Back"			},
 
   { 0,			NULL,			NULL			}
 };
@@ -4573,6 +4643,11 @@ static void DrawSetupScreen_Generic()
     setup_info = setup_info_artwork;
     title_string = "Custom Artwork";
   }
+  else if (setup_mode == SETUP_MODE_SHORTCUTS)
+  {
+    setup_info = setup_info_shortcuts;
+    title_string = "Setup Shortcuts";
+  }
   else if (setup_mode == SETUP_MODE_SHORTCUTS_1)
   {
     setup_info = setup_info_shortcuts_1;
@@ -4583,6 +4658,16 @@ static void DrawSetupScreen_Generic()
     setup_info = setup_info_shortcuts_2;
     title_string = "Setup Shortcuts";
   }
+  else if (setup_mode == SETUP_MODE_SHORTCUTS_3)
+  {
+    setup_info = setup_info_shortcuts_3;
+    title_string = "Setup Shortcuts";
+  }
+  else if (setup_mode == SETUP_MODE_SHORTCUTS_4)
+  {
+    setup_info = setup_info_shortcuts_4;
+    title_string = "Setup Shortcuts";
+  }
 
   DrawTextSCentered(mSY - SY + 16, FONT_TITLE_1, title_string);