#define SETUP_MODE_SHORTCUT 2
#define SETUP_MODE_GRAPHICS 3
#define SETUP_MODE_SOUND 4
-#define SETUP_MODE_CHOOSE_SOUNDS 5
+#define SETUP_MODE_CHOOSE_GRAPHICS 5
+#define SETUP_MODE_CHOOSE_SOUNDS 6
+#define SETUP_MODE_CHOOSE_MUSIC 7
-#define MAX_SETUP_MODES 6
+#define MAX_SETUP_MODES 8
/* for input setup functions */
#define SETUPINPUT_SCREEN_POS_START 0
/* needed if last screen was the setup screen and fullscreen state changed */
ToggleFullscreenIfNeeded();
+ /* needed if last screen (setup/level) changed graphics, sounds or music */
+ ReloadCustomArtwork();
+
#ifdef TARGET_SDL
SetDrawtoField(DRAW_BACKBUFFER);
#endif
/* leveldir_current may be invalid (level group, parent link) */
if (!validLevelSeries(leveldir_current))
- leveldir_current = getFirstValidLevelSeries(leveldir_last_valid);
+ leveldir_current = getFirstValidTreeInfoEntry(leveldir_last_valid);
/* store valid level series information */
leveldir_last_valid = leveldir_current;
#if 0
ClearEventQueue();
#endif
-
}
static void gotoTopLevelDir()
static struct TokenInfo *setup_info;
static int num_setup_info;
-static char *custom_artwork;
static void execSetupMain()
{
DrawSetupScreen();
}
+static void execSetupGraphics()
+{
+ setup.graphics_set = artwork.gfx_current->name;
+
+ setup_mode = SETUP_MODE_GRAPHICS;
+ DrawSetupScreen();
+}
+
static void execSetupSound()
{
- custom_artwork = artwork.snd_current->name;
+ setup.sounds_set = artwork.snd_current->name;
+ setup.music_set = artwork.mus_current->name;
setup_mode = SETUP_MODE_SOUND;
DrawSetupScreen();
}
+static void execSetupChooseGraphics()
+{
+ setup_mode = SETUP_MODE_CHOOSE_GRAPHICS;
+ DrawSetupScreen();
+}
+
static void execSetupChooseSounds()
{
setup_mode = SETUP_MODE_CHOOSE_SOUNDS;
DrawSetupScreen();
}
+static void execSetupChooseMusic()
+{
+ setup_mode = SETUP_MODE_CHOOSE_MUSIC;
+ DrawSetupScreen();
+}
+
static void execSetupInput()
{
setup_mode = SETUP_MODE_INPUT;
static void execExitSetupChooseArtwork()
{
- if (setup_mode == SETUP_MODE_CHOOSE_SOUNDS)
+ if (setup_mode == SETUP_MODE_CHOOSE_GRAPHICS)
+ execSetupGraphics();
+ else
execSetupSound();
}
static struct TokenInfo setup_info_main[] =
{
- { TYPE_ENTER_MENU, execSetupSound, "Sound Setup" },
- { TYPE_ENTER_MENU, execSetupInput, "Input Devices" },
- { TYPE_ENTER_MENU, execSetupShortcut, "Key Shortcuts" },
-#if 0
- { TYPE_EMPTY, NULL, "" },
- { TYPE_SWITCH, &setup.sound, "Sound:", },
- { TYPE_SWITCH, &setup.sound_loops, " Sound Loops:" },
- { TYPE_SWITCH, &setup.sound_music, " Game Music:" },
-#endif
- { TYPE_SWITCH, &setup.toons, "Toons:" },
-#if 0
- { TYPE_SWITCH, &setup.double_buffering,"Buffered gfx:" },
-#endif
- { TYPE_SWITCH, &setup.scroll_delay, "Scroll Delay:" },
- { TYPE_SWITCH, &setup.soft_scrolling, "Soft Scroll.:" },
+ { TYPE_ENTER_MENU, execSetupGraphics, "Graphics Setup" },
+ { TYPE_ENTER_MENU, execSetupSound, "Sound Setup" },
+ { TYPE_ENTER_MENU, execSetupInput, "Input Devices" },
+ { TYPE_ENTER_MENU, execSetupShortcut, "Key Shortcuts" },
+ { TYPE_EMPTY, NULL, "" },
#if 0
- { TYPE_SWITCH, &setup.fading, "Fading:" },
+ { TYPE_SWITCH, &setup.double_buffering,"Buffered gfx:" },
+ { TYPE_SWITCH, &setup.fading, "Fading:" },
#endif
- { TYPE_SWITCH, &setup.fullscreen, "Fullscreen:" },
- { TYPE_SWITCH, &setup.quick_doors, "Quick Doors:" },
- { TYPE_SWITCH, &setup.autorecord, "Auto-Record:" },
- { TYPE_SWITCH, &setup.team_mode, "Team-Mode:" },
- { TYPE_SWITCH, &setup.handicap, "Handicap:" },
- { TYPE_SWITCH, &setup.time_limit, "Timelimit:" },
- { TYPE_EMPTY, NULL, "" },
- { TYPE_LEAVE_MENU, execExitSetup, "Exit" },
- { TYPE_LEAVE_MENU, execSaveAndExitSetup, "Save and exit" },
- { 0, NULL, NULL }
+ { TYPE_SWITCH, &setup.quick_doors, "Quick Doors:" },
+ { TYPE_SWITCH, &setup.ask_on_escape, "Ask on Esc:" },
+ { TYPE_SWITCH, &setup.toons, "Toons:" },
+ { TYPE_SWITCH, &setup.autorecord, "Auto-Record:" },
+ { TYPE_SWITCH, &setup.team_mode, "Team-Mode:" },
+ { TYPE_SWITCH, &setup.handicap, "Handicap:" },
+ { TYPE_SWITCH, &setup.time_limit, "Timelimit:" },
+ { TYPE_EMPTY, NULL, "" },
+ { TYPE_LEAVE_MENU, execExitSetup, "Exit" },
+ { TYPE_LEAVE_MENU, execSaveAndExitSetup, "Save and exit" },
+ { 0, NULL, NULL }
+};
+
+static struct TokenInfo setup_info_graphics[] =
+{
+ { TYPE_ENTER_MENU, execSetupChooseGraphics,"Custom Graphics" },
+ { TYPE_STRING, &setup.graphics_set, "" },
+ { TYPE_EMPTY, NULL, "" },
+ { TYPE_SWITCH, &setup.fullscreen, "Fullscreen:" },
+ { TYPE_SWITCH, &setup.scroll_delay, "Scroll Delay:" },
+ { TYPE_SWITCH, &setup.soft_scrolling, "Soft Scroll.:" },
+ { TYPE_EMPTY, NULL, "" },
+ { TYPE_LEAVE_MENU, execSetupMain, "Exit" },
+ { 0, NULL, NULL }
};
static struct TokenInfo setup_info_sound[] =
{
- { TYPE_SWITCH, &setup.sound, "Sound:", },
- { TYPE_EMPTY, NULL, "" },
- { TYPE_SWITCH, &setup.sound_simple, "Simple Sound:" },
- { TYPE_SWITCH, &setup.sound_loops, "Sound Loops:" },
- { TYPE_SWITCH, &setup.sound_music, "Game Music:" },
- { TYPE_EMPTY, NULL, "" },
- { TYPE_ENTER_MENU, execSetupChooseSounds, "Custom Sounds" },
- { TYPE_STRING, &custom_artwork, "" },
- { TYPE_EMPTY, NULL, "" },
- { TYPE_LEAVE_MENU, execSetupMain, "Exit" },
- { 0, NULL, NULL }
+ { TYPE_SWITCH, &setup.sound, "Sound:", },
+ { TYPE_EMPTY, NULL, "" },
+ { TYPE_SWITCH, &setup.sound_simple, "Simple Sound:" },
+ { TYPE_SWITCH, &setup.sound_loops, "Sound Loops:" },
+ { TYPE_SWITCH, &setup.sound_music, "Game Music:" },
+ { TYPE_EMPTY, NULL, "" },
+ { TYPE_ENTER_MENU, execSetupChooseSounds, "Custom Sounds" },
+ { TYPE_STRING, &setup.sounds_set, "" },
+ { TYPE_ENTER_MENU, execSetupChooseMusic, "Custom Music" },
+ { TYPE_STRING, &setup.music_set, "" },
+ { TYPE_EMPTY, NULL, "" },
+ { TYPE_LEAVE_MENU, execSetupMain, "Exit" },
+ { 0, NULL, NULL }
};
static struct TokenInfo setup_info_shortcut[] =
{
int xpos = MENU_SCREEN_VALUE_XPOS;
int ypos = MENU_SCREEN_START_YPOS + pos;
- int value_color = FC_YELLOW;
+ int font_size = FS_BIG;
+ int font_color = FC_YELLOW;
char *value_string = getSetupValue(setup_info[pos].type & ~TYPE_GHOSTED,
setup_info[pos].value);
if (setup_info[pos].type & TYPE_QUERY)
{
value_string = "<press key>";
- value_color = FC_RED;
+ font_color = FC_RED;
}
}
else if (setup_info[pos].type & TYPE_STRING)
{
- xpos = 3;
+ int max_value_len = (SCR_FIELDX - 2) * 2;
+
+ xpos = 1;
+ font_size = FS_MEDIUM;
- if (strlen(value_string) > 14)
- value_string[14] = '\0';
+ if (strlen(value_string) > max_value_len)
+ value_string[max_value_len] = '\0';
}
else if (setup_info[pos].type & TYPE_BOOLEAN_STYLE &&
!*(boolean *)(setup_info[pos].value))
- value_color = FC_BLUE;
+ font_color = FC_BLUE;
DrawText(SX + xpos * 32, SY + ypos * 32,
(xpos == 3 ? " " : " "), FS_BIG, FC_YELLOW);
- DrawText(SX + xpos * 32, SY + ypos * 32, value_string, FS_BIG, value_color);
+ DrawText(SX + xpos * 32, SY + ypos * 32, value_string, font_size,font_color);
}
static void changeSetupValue(int pos)
setup_info = setup_info_main;
title_string = "Setup";
}
+ else if (setup_mode == SETUP_MODE_GRAPHICS)
+ {
+ setup_info = setup_info_graphics;
+ title_string = "Setup Graphics";
+ }
else if (setup_mode == SETUP_MODE_SOUND)
{
setup_info = setup_info_sound;
{
void *value_ptr = setup_info[i].value;
int ypos = MENU_SCREEN_START_YPOS + i;
+ int font_size = FS_BIG;
/* set some entries to "unchangeable" according to other variables */
if ((value_ptr == &setup.sound && !audio.sound_available) ||
(value_ptr == &setup.fullscreen && !video.fullscreen_available))
setup_info[i].type |= TYPE_GHOSTED;
- DrawText(SX + 32, SY + ypos * 32, setup_info[i].text, FS_BIG, FC_GREEN);
+ if (setup_info[i].type & TYPE_ENTER_OR_LEAVE_MENU)
+ font_size = FS_BIG;
+
+ DrawText(SX + 32, SY + ypos * 32, setup_info[i].text, font_size, FC_GREEN);
if (setup_info[i].type & TYPE_ENTER_MENU)
initCursor(i, GFX_ARROW_BLUE_RIGHT);
{
if (setup_mode == SETUP_MODE_INPUT)
DrawSetupScreen_Input();
+ else if (setup_mode == SETUP_MODE_CHOOSE_GRAPHICS)
+ DrawChooseTree(&artwork.gfx_current);
else if (setup_mode == SETUP_MODE_CHOOSE_SOUNDS)
DrawChooseTree(&artwork.snd_current);
+ else if (setup_mode == SETUP_MODE_CHOOSE_MUSIC)
+ DrawChooseTree(&artwork.mus_current);
else
DrawSetupScreen_Generic();
}
{
if (setup_mode == SETUP_MODE_INPUT)
HandleSetupScreen_Input(mx, my, dx, dy, button);
+ else if (setup_mode == SETUP_MODE_CHOOSE_GRAPHICS)
+ HandleChooseTree(mx, my, dx, dy, button, &artwork.gfx_current);
else if (setup_mode == SETUP_MODE_CHOOSE_SOUNDS)
HandleChooseTree(mx, my, dx, dy, button, &artwork.snd_current);
+ else if (setup_mode == SETUP_MODE_CHOOSE_MUSIC)
+ HandleChooseTree(mx, my, dx, dy, button, &artwork.mus_current);
else
HandleSetupScreen_Generic(mx, my, dx, dy, button);
}
projects / rocksndiamonds.git / blobdiff