UnmapAllGadgets();
FadeSounds();
KeyboardAutoRepeatOn();
- ActivateJoystickIfAvailable();
+ ActivateJoystick();
SetDrawDeactivationMask(REDRAW_NONE);
+ audio.sound_deactivated = FALSE;
/* needed if last screen was the playing screen, invoked from level editor */
if (level_editor_test_game)
/* 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()
FadeToFront();
InitAnimation();
- PlaySoundLoop(SND_RHYTHMLOOP);
+ PlaySoundLoop(SND_MENU_INFO_SCREEN);
}
void HandleHelpScreen(int button)
FadeToFront();
InitAnimation();
HandleHallOfFame(highlight_position,0, 0,0, MB_MENU_INITIALIZE);
- PlaySound(SND_HALLOFFAME);
+ PlaySound(SND_MENU_HALL_OF_FAME);
}
static void drawHallOfFameList(int first_entry, int highlight_position)
if (button_released)
{
- FadeSound(SND_HALLOFFAME);
+ FadeSound(SND_MENU_HALL_OF_FAME);
game_status = MAINMENU;
DrawMainMenu();
}
static struct TokenInfo *setup_info;
static int num_setup_info;
-static char *custom_graphics, *custom_sounds, *custom_music;
static void execSetupMain()
{
static void execSetupGraphics()
{
- custom_graphics = artwork.gfx_current->name;
+ setup.graphics_set = artwork.gfx_current->name;
setup_mode = SETUP_MODE_GRAPHICS;
DrawSetupScreen();
static void execSetupSound()
{
- custom_sounds = artwork.snd_current->name;
- custom_music = artwork.mus_current->name;
+ setup.sounds_set = artwork.snd_current->name;
+ setup.music_set = artwork.mus_current->name;
setup_mode = SETUP_MODE_SOUND;
DrawSetupScreen();
static struct TokenInfo setup_info_graphics[] =
{
{ TYPE_ENTER_MENU, execSetupChooseGraphics,"Custom Graphics" },
- { TYPE_STRING, &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.sound_music, "Game Music:" },
{ TYPE_EMPTY, NULL, "" },
{ TYPE_ENTER_MENU, execSetupChooseSounds, "Custom Sounds" },
- { TYPE_STRING, &custom_sounds, "" },
+ { TYPE_STRING, &setup.sounds_set, "" },
{ TYPE_ENTER_MENU, execSetupChooseMusic, "Custom Music" },
- { TYPE_STRING, &custom_music, "" },
+ { TYPE_STRING, &setup.music_set, "" },
{ TYPE_EMPTY, NULL, "" },
{ TYPE_LEAVE_MENU, execSetupMain, "Exit" },
{ 0, NULL, NULL }
{ TYPE_KEY, &setup.shortcut.save_game, "" },
{ TYPE_KEYTEXT, NULL, "Quick Load Game:", },
{ TYPE_KEY, &setup.shortcut.load_game, "" },
+ { TYPE_KEYTEXT, NULL, "Toggle Pause:", },
+ { TYPE_KEY, &setup.shortcut.toggle_pause, "" },
{ TYPE_EMPTY, NULL, "" },
{ TYPE_LEAVE_MENU, execSetupMain, "Exit" },
{ 0, NULL, NULL }
{
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)
DrawText(SX+32, SY+3*32, "Device:", FS_BIG, FC_GREEN);
DrawText(SX+32, SY+15*32, "Exit", FS_BIG, FC_GREEN);
+#if 0
DeactivateJoystickForCalibration();
DrawTextFCentered(SYSIZE - 20, FC_BLUE,
"Joysticks deactivated on this screen");
+#endif
HandleSetupScreen_Input(0,0, 0,0, MB_MENU_INITIALIZE);
FadeToFront();
void DrawSetupScreen()
{
+ DeactivateJoystick();
+
if (setup_mode == SETUP_MODE_INPUT)
DrawSetupScreen_Input();
else if (setup_mode == SETUP_MODE_CHOOSE_GRAPHICS)