/* sub-screens on the setup screen (specific) */
#define SETUP_MODE_CHOOSE_GAME_SPEED 15
#define SETUP_MODE_CHOOSE_SCREEN_MODE 16
-#define SETUP_MODE_CHOOSE_SCROLL_DELAY 17
-#define SETUP_MODE_CHOOSE_GRAPHICS 18
-#define SETUP_MODE_CHOOSE_SOUNDS 19
-#define SETUP_MODE_CHOOSE_MUSIC 20
+#define SETUP_MODE_CHOOSE_WINDOW_SIZE 17
+#define SETUP_MODE_CHOOSE_SCROLL_DELAY 18
+#define SETUP_MODE_CHOOSE_GRAPHICS 19
+#define SETUP_MODE_CHOOSE_SOUNDS 20
+#define SETUP_MODE_CHOOSE_MUSIC 21
+#define SETUP_MODE_CHOOSE_VOLUME_SIMPLE 22
+#define SETUP_MODE_CHOOSE_VOLUME_LOOPS 23
+#define SETUP_MODE_CHOOSE_VOLUME_MUSIC 24
-#define MAX_SETUP_MODES 21
+#define MAX_SETUP_MODES 25
/* for input setup functions */
#define SETUPINPUT_SCREEN_POS_START 0
static void CalibrateJoystick(int);
static void execSetupGame(void);
static void execSetupGraphics(void);
+static void execSetupSound(void);
static void execSetupArtwork(void);
static void HandleChooseTree(int, int, int, int, int, TreeInfo **);
static TreeInfo *screen_modes = NULL;
static TreeInfo *screen_mode_current = NULL;
+static TreeInfo *window_sizes = NULL;
+static TreeInfo *window_size_current = NULL;
+
static TreeInfo *scroll_delays = NULL;
static TreeInfo *scroll_delay_current = NULL;
static TreeInfo *game_speeds = NULL;
static TreeInfo *game_speed_current = NULL;
+static TreeInfo *volumes_simple = NULL;
+static TreeInfo *volume_simple_current = NULL;
+
+static TreeInfo *volumes_loops = NULL;
+static TreeInfo *volume_loops_current = NULL;
+
+static TreeInfo *volumes_music = NULL;
+static TreeInfo *volume_music_current = NULL;
+
static TreeInfo *level_number = NULL;
static TreeInfo *level_number_current = NULL;
+static struct
+{
+ int value;
+ char *text;
+} window_sizes_list[] =
+{
+ { 50, "50 %" },
+ { 80, "80 %" },
+ { 90, "90 %" },
+ { 100, "100 % (Default)" },
+ { 110, "110 %" },
+ { 120, "120 %" },
+ { 130, "130 %" },
+ { 140, "140 %" },
+ { 150, "150 %" },
+ { 200, "200 %" },
+ { 250, "250 %" },
+ { 300, "300 %" },
+
+ { -1, NULL },
+};
+
static struct
{
int value;
{ -1, NULL },
};
+static struct
+{
+ int value;
+ char *text;
+} volumes_list[] =
+{
+ { 0, "0 %" },
+ { 10, "10 %" },
+ { 20, "20 %" },
+ { 30, "30 %" },
+ { 40, "40 %" },
+ { 50, "50 %" },
+ { 60, "60 %" },
+ { 70, "70 %" },
+ { 80, "80 %" },
+ { 90, "90 %" },
+ { 100, "100 %" },
+
+ { -1, NULL },
+};
+
#define DRAW_MODE(s) ((s) >= GAME_MODE_MAIN && \
(s) <= GAME_MODE_SETUP ? (s) : \
(s) == GAME_MODE_PSEUDO_TYPENAME ? \
void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
{
- static unsigned long title_delay = 0;
+ static unsigned int title_delay = 0;
static int title_screen_nr = 0;
static int last_sound = -1, last_music = -1;
boolean return_to_main_menu = FALSE;
void HandleInfoScreen_Elements(int button)
{
- static unsigned long info_delay = 0;
+ static unsigned int info_delay = 0;
static int num_anims;
static int num_pages;
static int page;
"If you like it, send e-mail to:");
DrawTextSCentered(ystart2 + 2 * ystep, FONT_TEXT_3,
PROGRAM_EMAIL_STRING);
+#if 1
+ DrawTextSCentered(ystart2 + 4 * ystep, FONT_TEXT_2,
+ "More information and levels:");
+ DrawTextSCentered(ystart2 + 5 * ystep, FONT_TEXT_3,
+ PROGRAM_WEBSITE_STRING);
+ DrawTextSCentered(ystart2 + 7 * ystep, FONT_TEXT_2,
+ "If you have created new levels,");
+ DrawTextSCentered(ystart2 + 8 * ystep, FONT_TEXT_2,
+ "send them to me to include them!");
+ DrawTextSCentered(ystart2 + 9 * ystep, FONT_TEXT_2,
+ ":-)");
+#else
DrawTextSCentered(ystart2 + 3 * ystep, FONT_TEXT_2,
"or SnailMail to:");
DrawTextSCentered(ystart2 + 4 * ystep + 0, FONT_TEXT_3,
"send them to me to include them!");
DrawTextSCentered(ystart2 + 11 * ystep, FONT_TEXT_2,
":-)");
+#endif
DrawTextSCentered(ybottom, FONT_TEXT_4,
"Press any key or button for info menu");
#if defined(TARGET_SDL)
int xstart3 = mSX + 29 * xstep;
SDL_version sdl_version_compiled;
+#if defined(TARGET_SDL2)
+ SDL_version sdl_version_linked_ext;
+#endif
const SDL_version *sdl_version_linked;
+#if defined(TARGET_SDL2)
+ const char *driver_name = NULL;
+#else
int driver_name_len = 8;
char driver_name[driver_name_len];
+#endif
#endif
SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_VERSION);
DrawTextF(xstart3, ystart2, font_header, "linked");
SDL_VERSION(&sdl_version_compiled);
+#if defined(TARGET_SDL2)
+ SDL_GetVersion(&sdl_version_linked_ext);
+ sdl_version_linked = &sdl_version_linked_ext;
+#else
sdl_version_linked = SDL_Linked_Version();
+#endif
ystart2 += 2 * ystep;
DrawTextF(xstart1, ystart2, font_text, "SDL");
DrawTextF(xstart2, ystart2, font_header, "Requested");
DrawTextF(xstart3, ystart2, font_header, "Used");
+#if defined(TARGET_SDL2)
+ driver_name = SDL_GetVideoDriver(0);
+#else
SDL_VideoDriverName(driver_name, driver_name_len);
+#endif
ystart2 += 2 * ystep;
DrawTextF(xstart1, ystart2, font_text, "SDL_VideoDriver");
DrawTextF(xstart2, ystart2, font_text, "%s", setup.system.sdl_videodriver);
DrawTextF(xstart3, ystart2, font_text, "%s", driver_name);
+#if defined(TARGET_SDL2)
+ driver_name = SDL_GetAudioDriver(0);
+#else
SDL_AudioDriverName(driver_name, driver_name_len);
+#endif
ystart2 += ystep;
DrawTextF(xstart1, ystart2, font_text, "SDL_AudioDriver");
if (setup_mode == SETUP_MODE_CHOOSE_GAME_SPEED)
execSetupGame();
else if (setup_mode == SETUP_MODE_CHOOSE_SCREEN_MODE ||
+ setup_mode == SETUP_MODE_CHOOSE_WINDOW_SIZE ||
setup_mode == SETUP_MODE_CHOOSE_SCROLL_DELAY)
execSetupGraphics();
+ else if (setup_mode == SETUP_MODE_CHOOSE_VOLUME_SIMPLE ||
+ setup_mode == SETUP_MODE_CHOOSE_VOLUME_LOOPS ||
+ setup_mode == SETUP_MODE_CHOOSE_VOLUME_MUSIC)
+ execSetupSound();
else
execSetupArtwork();
}
if (setup_mode == SETUP_MODE_CHOOSE_GAME_SPEED)
execSetupGame();
else if (setup_mode == SETUP_MODE_CHOOSE_SCREEN_MODE ||
+ setup_mode == SETUP_MODE_CHOOSE_WINDOW_SIZE ||
setup_mode == SETUP_MODE_CHOOSE_SCROLL_DELAY)
execSetupGraphics();
+ else if (setup_mode == SETUP_MODE_CHOOSE_VOLUME_SIMPLE ||
+ setup_mode == SETUP_MODE_CHOOSE_VOLUME_LOOPS ||
+ setup_mode == SETUP_MODE_CHOOSE_VOLUME_MUSIC)
+ execSetupSound();
else
execSetupArtwork();
}
ti->node_top = &level_number;
ti->sort_priority = 10000 + value;
+ ti->color = (level.no_valid_file ? FC_BLUE :
+ LevelStats_getSolved(i) ? FC_GREEN :
+ LevelStats_getPlayed(i) ? FC_YELLOW : FC_RED);
sprintf(identifier, "%d", value);
- sprintf(name, "%03d: %s", value, level.name);
+ sprintf(name, "%03d: %s", value,
+ (level.no_valid_file ? "(no file)" : level.name));
setString(&ti->identifier, identifier);
setString(&ti->name, name);
static int num_setup_info;
static char *screen_mode_text;
+static char *window_size_text;
static char *scroll_delay_text;
static char *game_speed_text;
static char *graphics_set_name;
static char *sounds_set_name;
static char *music_set_name;
+static char *volume_simple_text;
+static char *volume_loops_text;
+static char *volume_music_text;
static void execSetupMain()
{
static void execSetupGraphics()
{
- if (video.fullscreen_available && screen_modes == NULL)
+ // if (screen_modes == NULL && video.fullscreen_available)
+ if (screen_modes == NULL && video.fullscreen_modes != NULL)
{
int i;
video.fullscreen_available = FALSE;
}
- if (video.fullscreen_available)
+ // if (video.fullscreen_available)
+ if (screen_mode_current != NULL)
{
setup.fullscreen_mode = screen_mode_current->identifier;
screen_mode_text = screen_mode_current->name;
}
+ if (window_sizes == NULL)
+ {
+ int i;
+
+ for (i = 0; window_sizes_list[i].value != -1; i++)
+ {
+ TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED);
+ char identifier[32], name[32];
+ int value = window_sizes_list[i].value;
+ char *text = window_sizes_list[i].text;
+
+ ti->node_top = &window_sizes;
+ ti->sort_priority = value;
+
+ sprintf(identifier, "%d", value);
+ sprintf(name, "%s", text);
+
+ setString(&ti->identifier, identifier);
+ setString(&ti->name, name);
+ setString(&ti->name_sorting, name);
+ setString(&ti->infotext, "Window Scaling");
+
+ pushTreeInfo(&window_sizes, ti);
+ }
+
+ /* sort window size values to start with lowest window size value */
+ sortTreeInfo(&window_sizes);
+
+ /* set current window size value to configured window size value */
+ window_size_current =
+ getTreeInfoFromIdentifier(window_sizes,
+ i_to_a(setup.window_scaling_percent));
+
+ /* if that fails, set current window size to reliable default value */
+ if (window_size_current == NULL)
+ window_size_current =
+ getTreeInfoFromIdentifier(window_sizes,
+ i_to_a(STD_WINDOW_SCALING_PERCENT));
+
+ /* if that also fails, set current window size to first available value */
+ if (window_size_current == NULL)
+ window_size_current = window_sizes;
+ }
+
+ setup.window_scaling_percent = atoi(window_size_current->identifier);
+
+ /* needed for displaying window size text instead of identifier */
+ window_size_text = window_size_current->name;
+
#if 1
if (scroll_delays == NULL)
{
#endif
setup_mode = SETUP_MODE_GRAPHICS;
+
DrawSetupScreen();
}
+#if !defined(PLATFORM_ANDROID)
+#if defined(TARGET_SDL2)
+static void execSetupChooseWindowSize()
+{
+#if 0
+ if (!video.window_scaling_available)
+ return;
+#endif
+
+ setup_mode = SETUP_MODE_CHOOSE_WINDOW_SIZE;
+
+ DrawSetupScreen();
+}
+#else
static void execSetupChooseScreenMode()
{
if (!video.fullscreen_available)
DrawSetupScreen();
}
+#endif
+#endif
static void execSetupChooseScrollDelay()
{
DrawSetupScreen();
}
+static void execSetupChooseVolumeSimple()
+{
+ setup_mode = SETUP_MODE_CHOOSE_VOLUME_SIMPLE;
+
+ DrawSetupScreen();
+}
+
+static void execSetupChooseVolumeLoops()
+{
+ setup_mode = SETUP_MODE_CHOOSE_VOLUME_LOOPS;
+
+ DrawSetupScreen();
+}
+
+static void execSetupChooseVolumeMusic()
+{
+ setup_mode = SETUP_MODE_CHOOSE_VOLUME_MUSIC;
+
+ DrawSetupScreen();
+}
+
static void execSetupSound()
{
+#if 1
+ if (volumes_simple == NULL)
+ {
+ int i;
+
+ for (i = 0; volumes_list[i].value != -1; i++)
+ {
+ TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED);
+ char identifier[32], name[32];
+ int value = volumes_list[i].value;
+ char *text = volumes_list[i].text;
+
+ ti->node_top = &volumes_simple;
+ ti->sort_priority = value;
+
+ sprintf(identifier, "%d", value);
+ sprintf(name, "%s", text);
+
+ setString(&ti->identifier, identifier);
+ setString(&ti->name, name);
+ setString(&ti->name_sorting, name);
+ setString(&ti->infotext, "Sound Volume");
+
+ pushTreeInfo(&volumes_simple, ti);
+ }
+
+ /* sort volume values to start with lowest volume value */
+ sortTreeInfo(&volumes_simple);
+
+ /* set current volume value to configured volume value */
+ volume_simple_current =
+ getTreeInfoFromIdentifier(volumes_simple,i_to_a(setup.volume_simple));
+
+ /* if that fails, set current volume to reliable default value */
+ if (volume_simple_current == NULL)
+ volume_simple_current =
+ getTreeInfoFromIdentifier(volumes_simple, i_to_a(100));
+
+ /* if that also fails, set current volume to first available value */
+ if (volume_simple_current == NULL)
+ volume_simple_current = volumes_simple;
+ }
+
+ if (volumes_loops == NULL)
+ {
+ int i;
+
+ for (i = 0; volumes_list[i].value != -1; i++)
+ {
+ TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED);
+ char identifier[32], name[32];
+ int value = volumes_list[i].value;
+ char *text = volumes_list[i].text;
+
+ ti->node_top = &volumes_loops;
+ ti->sort_priority = value;
+
+ sprintf(identifier, "%d", value);
+ sprintf(name, "%s", text);
+
+ setString(&ti->identifier, identifier);
+ setString(&ti->name, name);
+ setString(&ti->name_sorting, name);
+ setString(&ti->infotext, "Loops Volume");
+
+ pushTreeInfo(&volumes_loops, ti);
+ }
+
+ /* sort volume values to start with lowest volume value */
+ sortTreeInfo(&volumes_loops);
+
+ /* set current volume value to configured volume value */
+ volume_loops_current =
+ getTreeInfoFromIdentifier(volumes_loops,i_to_a(setup.volume_loops));
+
+ /* if that fails, set current volume to reliable default value */
+ if (volume_loops_current == NULL)
+ volume_loops_current =
+ getTreeInfoFromIdentifier(volumes_loops, i_to_a(100));
+
+ /* if that also fails, set current volume to first available value */
+ if (volume_loops_current == NULL)
+ volume_loops_current = volumes_loops;
+ }
+
+ if (volumes_music == NULL)
+ {
+ int i;
+
+ for (i = 0; volumes_list[i].value != -1; i++)
+ {
+ TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED);
+ char identifier[32], name[32];
+ int value = volumes_list[i].value;
+ char *text = volumes_list[i].text;
+
+ ti->node_top = &volumes_music;
+ ti->sort_priority = value;
+
+ sprintf(identifier, "%d", value);
+ sprintf(name, "%s", text);
+
+ setString(&ti->identifier, identifier);
+ setString(&ti->name, name);
+ setString(&ti->name_sorting, name);
+ setString(&ti->infotext, "Music Volume");
+
+ pushTreeInfo(&volumes_music, ti);
+ }
+
+ /* sort volume values to start with lowest volume value */
+ sortTreeInfo(&volumes_music);
+
+ /* set current volume value to configured volume value */
+ volume_music_current =
+ getTreeInfoFromIdentifier(volumes_music,i_to_a(setup.volume_music));
+
+ /* if that fails, set current volume to reliable default value */
+ if (volume_music_current == NULL)
+ volume_music_current =
+ getTreeInfoFromIdentifier(volumes_music, i_to_a(100));
+
+ /* if that also fails, set current volume to first available value */
+ if (volume_music_current == NULL)
+ volume_music_current = volumes_music;
+ }
+
+ setup.volume_simple = atoi(volume_simple_current->identifier);
+ setup.volume_loops = atoi(volume_loops_current->identifier);
+ setup.volume_music = atoi(volume_music_current->identifier);
+
+ /* needed for displaying volume text instead of identifier */
+ volume_simple_text = volume_simple_current->name;
+ volume_loops_text = volume_loops_current->name;
+ volume_music_text = volume_music_current->name;
+#endif
+
setup_mode = SETUP_MODE_SOUND;
DrawSetupScreen();
static struct TokenInfo setup_info_graphics[] =
{
+#if !defined(PLATFORM_ANDROID)
{ TYPE_SWITCH, &setup.fullscreen, "Fullscreen:" },
+#if defined(TARGET_SDL2)
+ { TYPE_ENTER_LIST, execSetupChooseWindowSize, "Window Scaling:" },
+ { TYPE_STRING, &window_size_text, "" },
+#else
{ TYPE_ENTER_LIST, execSetupChooseScreenMode, "Fullscreen Mode:" },
{ TYPE_STRING, &screen_mode_text, "" },
+#endif
+#endif
#if 0
{ TYPE_SWITCH, &setup.scroll_delay, "Scroll Delay:" },
#endif
{ TYPE_SWITCH, &setup.sound_loops, "Sound Effects (Looping):" },
{ TYPE_SWITCH, &setup.sound_music, "Music:" },
{ TYPE_EMPTY, NULL, "" },
+ { TYPE_ENTER_LIST, execSetupChooseVolumeSimple, "Sound Volume (Normal):" },
+ { TYPE_STRING, &volume_simple_text, "" },
+ { TYPE_ENTER_LIST, execSetupChooseVolumeLoops, "Sound Volume (Looping):" },
+ { TYPE_STRING, &volume_loops_text, "" },
+ { TYPE_ENTER_LIST, execSetupChooseVolumeMusic, "Music Volume:" },
+ { TYPE_STRING, &volume_music_text, "" },
+ { TYPE_EMPTY, NULL, "" },
{ TYPE_LEAVE_MENU, execSetupMain, "Back" },
{ 0, NULL, NULL }
int ypos = MENU_SCREEN_START_YPOS + pos;
int startx = mSX + xpos * 32;
int starty = mSY + ypos * 32;
- int font_nr, font_width, font_height;
+ int font_nr, font_width;
+#if 0
+ int font_height;
+#endif
int type = setup_info[pos].type;
void *value = setup_info[pos].value;
char *value_string = getSetupValue(type, value);
starty = mSY + ypos * 32;
font_nr = getSetupValueFont(type, value);
font_width = getFontWidth(font_nr);
+#if 0
font_height = getFontHeight(font_nr);
+#endif
/* downward compatibility correction for Juergen Bonhagen's menu settings */
if (setup_mode != SETUP_MODE_INPUT)
(value_ptr == &setup.sound_loops && !audio.loops_available) ||
(value_ptr == &setup.sound_music && !audio.music_available) ||
(value_ptr == &setup.fullscreen && !video.fullscreen_available) ||
- (value_ptr == &screen_mode_text && !video.fullscreen_available))
+ (value_ptr == &screen_mode_text && !video.fullscreen_available) ||
+ (value_ptr == &window_size_text && !video.window_scaling_available))
setup_info[i].type |= TYPE_GHOSTED;
if (setup_info[i].type & (TYPE_ENTER_MENU|TYPE_ENTER_LIST))
DrawChooseTree(&game_speed_current);
else if (setup_mode == SETUP_MODE_CHOOSE_SCREEN_MODE)
DrawChooseTree(&screen_mode_current);
+ else if (setup_mode == SETUP_MODE_CHOOSE_WINDOW_SIZE)
+ DrawChooseTree(&window_size_current);
else if (setup_mode == SETUP_MODE_CHOOSE_SCROLL_DELAY)
DrawChooseTree(&scroll_delay_current);
else if (setup_mode == SETUP_MODE_CHOOSE_GRAPHICS)
DrawChooseTree(&artwork.snd_current);
else if (setup_mode == SETUP_MODE_CHOOSE_MUSIC)
DrawChooseTree(&artwork.mus_current);
+ else if (setup_mode == SETUP_MODE_CHOOSE_VOLUME_SIMPLE)
+ DrawChooseTree(&volume_simple_current);
+ else if (setup_mode == SETUP_MODE_CHOOSE_VOLUME_LOOPS)
+ DrawChooseTree(&volume_loops_current);
+ else if (setup_mode == SETUP_MODE_CHOOSE_VOLUME_MUSIC)
+ DrawChooseTree(&volume_music_current);
else
DrawSetupScreen_Generic();
HandleChooseTree(mx, my, dx, dy, button, &game_speed_current);
else if (setup_mode == SETUP_MODE_CHOOSE_SCREEN_MODE)
HandleChooseTree(mx, my, dx, dy, button, &screen_mode_current);
+ else if (setup_mode == SETUP_MODE_CHOOSE_WINDOW_SIZE)
+ HandleChooseTree(mx, my, dx, dy, button, &window_size_current);
else if (setup_mode == SETUP_MODE_CHOOSE_SCROLL_DELAY)
HandleChooseTree(mx, my, dx, dy, button, &scroll_delay_current);
else if (setup_mode == SETUP_MODE_CHOOSE_GRAPHICS)
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 if (setup_mode == SETUP_MODE_CHOOSE_VOLUME_SIMPLE)
+ HandleChooseTree(mx, my, dx, dy, button, &volume_simple_current);
+ else if (setup_mode == SETUP_MODE_CHOOSE_VOLUME_LOOPS)
+ HandleChooseTree(mx, my, dx, dy, button, &volume_loops_current);
+ else if (setup_mode == SETUP_MODE_CHOOSE_VOLUME_MUSIC)
+ HandleChooseTree(mx, my, dx, dy, button, &volume_music_current);
else
HandleSetupScreen_Generic(mx, my, dx, dy, button);
static void CreateScreenMenubuttons()
{
struct GadgetInfo *gi;
- unsigned long event_mask;
+ unsigned int event_mask;
int i;
for (i = 0; i < NUM_SCREEN_MENUBUTTONS; i++)
static void CreateScreenScrollbuttons()
{
struct GadgetInfo *gi;
- unsigned long event_mask;
+ unsigned int event_mask;
int i;
/* these values are not constant, but can change at runtime */
int gd_x1, gd_x2, gd_y1, gd_y2;
struct GadgetInfo *gi;
int items_max, items_visible, item_position;
- unsigned long event_mask;
+ unsigned int event_mask;
int num_page_entries = NUM_MENU_ENTRIES_ON_SCREEN;
int id = scrollbar_info[i].gadget_id;
projects / rocksndiamonds.git / blobdiff