#define SETUP_MODE_CHOOSE_SNAPSHOT_MODE 18
#define SETUP_MODE_CHOOSE_WINDOW_SIZE 19
#define SETUP_MODE_CHOOSE_SCALING_TYPE 20
-#define SETUP_MODE_CHOOSE_GRAPHICS 21
-#define SETUP_MODE_CHOOSE_SOUNDS 22
-#define SETUP_MODE_CHOOSE_MUSIC 23
-#define SETUP_MODE_CHOOSE_VOLUME_SIMPLE 24
-#define SETUP_MODE_CHOOSE_VOLUME_LOOPS 25
-#define SETUP_MODE_CHOOSE_VOLUME_MUSIC 26
-#define SETUP_MODE_CHOOSE_TOUCH_CONTROL 27
-#define SETUP_MODE_CHOOSE_MOVE_DISTANCE 28
-#define SETUP_MODE_CHOOSE_DROP_DISTANCE 29
-
-#define MAX_SETUP_MODES 30
+#define SETUP_MODE_CHOOSE_RENDERING 21
+#define SETUP_MODE_CHOOSE_GRAPHICS 22
+#define SETUP_MODE_CHOOSE_SOUNDS 23
+#define SETUP_MODE_CHOOSE_MUSIC 24
+#define SETUP_MODE_CHOOSE_VOLUME_SIMPLE 25
+#define SETUP_MODE_CHOOSE_VOLUME_LOOPS 26
+#define SETUP_MODE_CHOOSE_VOLUME_MUSIC 27
+#define SETUP_MODE_CHOOSE_TOUCH_CONTROL 28
+#define SETUP_MODE_CHOOSE_MOVE_DISTANCE 29
+#define SETUP_MODE_CHOOSE_DROP_DISTANCE 30
+
+#define MAX_SETUP_MODES 31
#define MAX_MENU_MODES MAX(MAX_INFO_MODES, MAX_SETUP_MODES)
static TreeInfo *scaling_types = NULL;
static TreeInfo *scaling_type_current = NULL;
+static TreeInfo *rendering_modes = NULL;
+static TreeInfo *rendering_mode_current = NULL;
+
static TreeInfo *scroll_delays = NULL;
static TreeInfo *scroll_delay_current = NULL;
{ NULL, NULL },
};
+static struct
+{
+ char *value;
+ char *text;
+} rendering_modes_list[] =
+{
+ { STR_SPECIAL_RENDERING_OFF, "Off (May show artifacts, fast)" },
+ { STR_SPECIAL_RENDERING_BITMAP, "Bitmap/Texture mode (slower)" },
+ { STR_SPECIAL_RENDERING_TARGET, "Target Texture mode (slower)" },
+ { STR_SPECIAL_RENDERING_DOUBLE, "Double Texture mode (slower)" },
+
+ { NULL, NULL },
+};
+
static struct
{
int value;
setup_mode == SETUP_MODE_CHOOSE_SNAPSHOT_MODE)
execSetupGame();
else if (setup_mode == SETUP_MODE_CHOOSE_WINDOW_SIZE ||
- setup_mode == SETUP_MODE_CHOOSE_SCALING_TYPE)
+ setup_mode == SETUP_MODE_CHOOSE_SCALING_TYPE ||
+ setup_mode == SETUP_MODE_CHOOSE_RENDERING)
execSetupGraphics();
else if (setup_mode == SETUP_MODE_CHOOSE_VOLUME_SIMPLE ||
setup_mode == SETUP_MODE_CHOOSE_VOLUME_LOOPS ||
setup_mode == SETUP_MODE_CHOOSE_SNAPSHOT_MODE)
execSetupGame();
else if (setup_mode == SETUP_MODE_CHOOSE_WINDOW_SIZE ||
- setup_mode == SETUP_MODE_CHOOSE_SCALING_TYPE)
+ setup_mode == SETUP_MODE_CHOOSE_SCALING_TYPE ||
+ setup_mode == SETUP_MODE_CHOOSE_RENDERING)
execSetupGraphics();
else if (setup_mode == SETUP_MODE_CHOOSE_VOLUME_SIMPLE ||
setup_mode == SETUP_MODE_CHOOSE_VOLUME_LOOPS ||
static char *window_size_text;
static char *scaling_type_text;
+static char *rendering_mode_text;
static char *scroll_delay_text;
static char *snapshot_mode_text;
static char *game_speed_text;
setString(&ti->identifier, identifier);
setString(&ti->name, name);
setString(&ti->name_sorting, name);
- setString(&ti->infotext, "Scaling Type");
+ setString(&ti->infotext, "Scroll Delay");
pushTreeInfo(&scroll_delays, ti);
}
- /* sort scaling type values to start with lowest scaling type value */
+ /* sort scroll delay values to start with lowest scroll delay value */
sortTreeInfo(&scroll_delays);
- /* set current scaling type value to configured scaling type value */
+ /* set current scroll delay value to configured scroll delay value */
scroll_delay_current =
getTreeInfoFromIdentifier(scroll_delays,i_to_a(setup.scroll_delay_value));
- /* if that fails, set current scaling type to reliable default value */
+ /* if that fails, set current scroll delay to reliable default value */
if (scroll_delay_current == NULL)
scroll_delay_current =
getTreeInfoFromIdentifier(scroll_delays, i_to_a(STD_SCROLL_DELAY));
- /* if that also fails, set current scaling type to first available value */
+ /* if that also fails, set current scroll delay to first available value */
if (scroll_delay_current == NULL)
scroll_delay_current = scroll_delays;
}
setup.scroll_delay_value = atoi(scroll_delay_current->identifier);
- /* needed for displaying scaling type text instead of identifier */
+ /* needed for displaying scroll delay text instead of identifier */
scroll_delay_text = scroll_delay_current->name;
}
scaling_type_text = scaling_type_current->name;
}
+static void execSetupGraphics_setRenderingModes()
+{
+ if (rendering_modes == NULL)
+ {
+ int i;
+
+ for (i = 0; rendering_modes_list[i].value != NULL; i++)
+ {
+ TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED);
+ char identifier[32], name[32];
+ char *value = rendering_modes_list[i].value;
+ char *text = rendering_modes_list[i].text;
+
+ ti->node_top = &rendering_modes;
+ ti->sort_priority = i;
+
+ sprintf(identifier, "%s", value);
+ sprintf(name, "%s", text);
+
+ setString(&ti->identifier, identifier);
+ setString(&ti->name, name);
+ setString(&ti->name_sorting, name);
+ setString(&ti->infotext, "Special Rendering");
+
+ pushTreeInfo(&rendering_modes, ti);
+ }
+
+ /* sort rendering mode values to start with lowest rendering mode value */
+ sortTreeInfo(&rendering_modes);
+
+ /* set current rendering mode value to configured rendering mode value */
+ rendering_mode_current =
+ getTreeInfoFromIdentifier(rendering_modes, setup.screen_rendering_mode);
+
+ /* if that fails, set current rendering mode to reliable default value */
+ if (rendering_mode_current == NULL)
+ rendering_mode_current =
+ getTreeInfoFromIdentifier(rendering_modes,
+ STR_SPECIAL_RENDERING_DEFAULT);
+
+ /* if that also fails, set current rendering mode to first available one */
+ if (rendering_mode_current == NULL)
+ rendering_mode_current = rendering_modes;
+ }
+
+ setup.screen_rendering_mode = rendering_mode_current->identifier;
+
+ /* needed for displaying rendering mode text instead of identifier */
+ rendering_mode_text = rendering_mode_current->name;
+}
+
static void execSetupGraphics()
{
if (setup_mode == SETUP_MODE_CHOOSE_WINDOW_SIZE)
}
execSetupGraphics_setScalingTypes();
+ execSetupGraphics_setRenderingModes();
setup_mode = SETUP_MODE_GRAPHICS;
// window scaling quality may have changed at this point
if (!strEqual(setup.window_scaling_quality, video.window_scaling_quality))
SDLSetWindowScalingQuality(setup.window_scaling_quality);
+
+ // screen rendering mode may have changed at this point
+ SDLSetScreenRenderingMode(setup.screen_rendering_mode);
#endif
}
DrawSetupScreen();
}
+
+static void execSetupChooseRenderingMode()
+{
+ setup_mode = SETUP_MODE_CHOOSE_RENDERING;
+
+ DrawSetupScreen();
+}
#endif
static void execSetupChooseVolumeSimple()
{ TYPE_STRING, &window_size_text, "" },
{ TYPE_ENTER_LIST, execSetupChooseScalingType, "Anti-Aliasing:" },
{ TYPE_STRING, &scaling_type_text, "" },
+ { TYPE_ENTER_LIST, execSetupChooseRenderingMode, "Special Rendering:" },
+ { TYPE_STRING, &rendering_mode_text, "" },
#endif
#if 0
{ TYPE_ENTER_LIST, execSetupChooseScrollDelay, "Scroll Delay:" },
return FONT_VALUE_1;
}
+static int getSetupValueFontNarrow(int type, int font_nr)
+{
+ return (font_nr == FONT_VALUE_1 ? FONT_VALUE_NARROW :
+ font_nr == FONT_OPTION_ON ? FONT_OPTION_ON_NARROW :
+ font_nr == FONT_OPTION_OFF ? FONT_OPTION_OFF_NARROW :
+ font_nr);
+}
+
static void drawSetupValue(int screen_pos, int setup_info_pos_raw)
{
int si_pos = (setup_info_pos_raw < 0 ? screen_pos : setup_info_pos_raw);
struct TokenInfo *si = &setup_info[si_pos];
boolean font_draw_xoffset_modified = FALSE;
+ boolean scrollbar_needed = (num_setup_info < max_setup_info);
int font_draw_xoffset_old = -1;
- int xoffset = (num_setup_info < max_setup_info ? -1 : 0);
+ int xoffset = (scrollbar_needed ? -1 : 0);
int menu_screen_value_xpos = MENU_SCREEN_VALUE_XPOS + xoffset;
int menu_screen_max_xpos = MENU_SCREEN_MAX_XPOS + xoffset;
int xpos = menu_screen_value_xpos;
font_nr = getSetupValueFont(type, value);
font_width = getFontWidth(font_nr);
+ // special check if right-side setup values moved left due to scrollbar
+ if (scrollbar_needed && xpos > MENU_SCREEN_START_XPOS)
+ {
+ int max_menu_text_length = 26; // maximum text length for classic menu
+ int font_xoffset = getFontBitmapInfo(font_nr)->draw_xoffset;
+ int text_startx = mSX + MENU_SCREEN_START_XPOS * 32;
+ int text_font_nr = getMenuTextFont(FONT_MENU_2);
+ int text_font_xoffset = getFontBitmapInfo(text_font_nr)->draw_xoffset;
+ int text_width = max_menu_text_length * getFontWidth(text_font_nr);
+
+ if (startx + font_xoffset < text_startx + text_width + text_font_xoffset)
+ {
+ xpos += 1;
+ startx = mSX + xpos * 32;
+
+ font_nr = getSetupValueFontNarrow(type, font_nr);
+ font_width = getFontWidth(font_nr);
+ }
+ }
+
/* downward compatibility correction for Juergen Bonhagen's menu settings */
if (setup_mode != SETUP_MODE_INPUT)
{
DrawChooseTree(&window_size_current);
else if (setup_mode == SETUP_MODE_CHOOSE_SCALING_TYPE)
DrawChooseTree(&scaling_type_current);
+ else if (setup_mode == SETUP_MODE_CHOOSE_RENDERING)
+ DrawChooseTree(&rendering_mode_current);
else if (setup_mode == SETUP_MODE_CHOOSE_GRAPHICS)
DrawChooseTree(&artwork.gfx_current);
else if (setup_mode == SETUP_MODE_CHOOSE_SOUNDS)
HandleChooseTree(mx, my, dx, dy, button, &window_size_current);
else if (setup_mode == SETUP_MODE_CHOOSE_SCALING_TYPE)
HandleChooseTree(mx, my, dx, dy, button, &scaling_type_current);
+ else if (setup_mode == SETUP_MODE_CHOOSE_RENDERING)
+ HandleChooseTree(mx, my, dx, dy, button, &rendering_mode_current);
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)