X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fscreens.c;h=9fbd5b1b487ea80e54320890e3389d04a3043a19;hp=74690d7fd3ce52c2a6cc59228950b3a3ac41cde4;hb=59ee473b86e7cbc1d9b09a3c22b0bbd3a410f16f;hpb=d442dd6ca65b694c37fbd3c93505644fe8478263

diff --git a/src/screens.c b/src/screens.c
index 74690d7f..9fbd5b1b 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -49,20 +49,21 @@
 #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	11
-#define SETUP_MODE_CHOOSE_OTHER		12
+#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	13
-#define SETUP_MODE_CHOOSE_SCREEN_MODE	14
-#define SETUP_MODE_CHOOSE_SCROLL_DELAY	15
-#define SETUP_MODE_CHOOSE_GRAPHICS	16
-#define SETUP_MODE_CHOOSE_SOUNDS	17
-#define SETUP_MODE_CHOOSE_MUSIC		18
+#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			19
+#define MAX_SETUP_MODES			20
 
 /* for input setup functions */
 #define SETUPINPUT_SCREEN_POS_START	0
@@ -234,7 +235,7 @@ static struct
 				 INFO_MODE_MAIN)
 
 #define DRAW_MODE_SETUP(i)	((i) >= SETUP_MODE_MAIN &&		\
-				 (i) <= SETUP_MODE_SHORTCUTS_3 ? (i) :	\
+				 (i) <= SETUP_MODE_SHORTCUTS_4 ? (i) :	\
 				 (i) >= SETUP_MODE_CHOOSE_GRAPHICS &&	\
 				 (i) <= SETUP_MODE_CHOOSE_MUSIC ?	\
 				 SETUP_MODE_CHOOSE_ARTWORK :		\
@@ -1265,6 +1266,8 @@ void DrawMainMenuExt(int fade_mask, boolean do_fading)
   /* store valid level series information */
   leveldir_last_valid = leveldir_current;
 
+  init_last = init;			/* switch to new busy animation */
+
   /* needed if last screen (level choice) changed graphics, sounds or music */
   ReloadCustomArtwork(0);
 
@@ -1282,6 +1285,11 @@ void DrawMainMenuExt(int fade_mask, boolean do_fading)
 #endif
 #endif
 
+#if 1
+  /* needed if newly loaded custom artwork requires a different screen mode */
+  ChangeScreenModeIfNeeded();
+#endif
+
 #if defined(TARGET_SDL)
   SetDrawtoField(DRAW_BACKBUFFER);
 #endif
@@ -4111,6 +4119,13 @@ static void execSetupShortcuts3()
   DrawSetupScreen();
 }
 
+static void execSetupShortcuts4()
+{
+  setup_mode = SETUP_MODE_SHORTCUTS_4;
+
+  DrawSetupScreen();
+}
+
 static void execExitSetup()
 {
   game_status = GAME_MODE_MAIN;
@@ -4283,6 +4298,7 @@ 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"			},
 
@@ -4326,15 +4342,15 @@ static struct TokenInfo setup_info_shortcuts_2[] =
 
 static struct TokenInfo setup_info_shortcuts_3[] =
 {
-  { TYPE_KEYTEXT,	NULL,		"Tape Eject:",			},
+  { TYPE_KEYTEXT,	NULL,			"Tape Eject:",		},
   { TYPE_KEY,		&setup.shortcut.tape_eject, ""			},
-  { TYPE_KEYTEXT,	NULL,		"Tape Stop:",			},
+  { TYPE_KEYTEXT,	NULL,			"Tape Stop:",		},
   { TYPE_KEY,		&setup.shortcut.tape_stop, ""			},
-  { TYPE_KEYTEXT,	NULL,		"Tape Pause:",			},
+  { TYPE_KEYTEXT,	NULL,			"Tape Pause:",		},
   { TYPE_KEY,		&setup.shortcut.tape_pause, ""			},
-  { TYPE_KEYTEXT,	NULL,		"Tape Record:",			},
+  { TYPE_KEYTEXT,	NULL,			"Tape Record:",		},
   { TYPE_KEY,		&setup.shortcut.tape_record, ""			},
-  { TYPE_KEYTEXT,	NULL,		"Tape Play:",			},
+  { TYPE_KEYTEXT,	NULL,			"Tape Play:",		},
   { TYPE_KEY,		&setup.shortcut.tape_play, ""			},
   { TYPE_EMPTY,		NULL,			""			},
   { TYPE_LEAVE_MENU,	execSetupShortcuts,	"Back"			},
@@ -4342,6 +4358,20 @@ static struct TokenInfo setup_info_shortcuts_3[] =
   { 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			}
+};
+
 static Key getSetupKey()
 {
   Key key = KSYM_UNDEFINED;
@@ -4640,6 +4670,11 @@ static void DrawSetupScreen_Generic()
     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);