#define SC_BORDER_SIZE 14
+#define TITLE_SCREEN_FADE_DELAY 250
+
/* forward declarations of internal functions */
static void HandleScreenGadgets(struct GadgetInfo *);
DrawTextSCentered(MENU_TITLE2_YPOS, FONT_TITLE_2, PROGRAM_COPYRIGHT_STRING);
}
-static void ToggleFullscreenIfNeeded()
-{
- if (setup.fullscreen != video.fullscreen_enabled)
- {
- /* save old door content */
- BlitBitmap(backbuffer, bitmap_db_door,
- DX, DY, DXSIZE, DYSIZE, DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1);
-
- /* toggle fullscreen */
- ChangeVideoModeIfNeeded(setup.fullscreen);
- setup.fullscreen = video.fullscreen_enabled;
-
- /* redraw background to newly created backbuffer */
- BlitBitmap(graphic_info[IMG_GLOBAL_BORDER].bitmap, backbuffer,
- 0,0, WIN_XSIZE,WIN_YSIZE, 0,0);
-
- /* restore old door content */
- BlitBitmap(bitmap_db_door, backbuffer,
- DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1, DXSIZE, DYSIZE, DX, DY);
-
- redraw_mask = REDRAW_ALL;
- }
-}
-
static int getLastLevelButtonPos()
{
return 10;
#endif
#endif
- DrawMicroLevel(MICROLEVEL_XPOS, MICROLEVEL_YPOS, TRUE);
+ DrawPreviewLevel(TRUE);
#if 1
boolean return_to_main_menu = FALSE;
boolean use_fading_main_menu = TRUE;
boolean use_cross_fading = TRUE;
- int fade_delay = 500;
+ int fade_delay = TITLE_SCREEN_FADE_DELAY;
int post_delay = fade_delay / 2;
if (button == MB_MENU_INITIALIZE)
DrawText(mSX + 11 * 32, mSY + 3 * 32, int2str(level_nr, 3), FONT_VALUE_1);
LoadLevel(level_nr);
- DrawMicroLevel(MICROLEVEL_XPOS, MICROLEVEL_YPOS, TRUE);
+ DrawPreviewLevel(TRUE);
TapeErase();
LoadTape(level_nr);
DrawCompleteVideoDisplay();
- /* needed because DrawMicroLevel() takes some time */
+ /* needed because DrawPreviewLevel() takes some time */
BackToFront();
SyncDisplay();
}
FONT_VALUE_1);
LoadLevel(level_nr);
- DrawMicroLevel(MICROLEVEL_XPOS, MICROLEVEL_YPOS, TRUE);
+ DrawPreviewLevel(TRUE);
TapeErase();
LoadTape(level_nr);
DrawCompleteVideoDisplay();
- /* needed because DrawMicroLevel() takes some time */
+ /* needed because DrawPreviewLevel() takes some time */
BackToFront();
SyncDisplay();
if (game_status == GAME_MODE_MAIN)
{
- DrawMicroLevel(MICROLEVEL_XPOS, MICROLEVEL_YPOS, FALSE);
+ DrawPreviewLevel(FALSE);
DoAnimation();
}
}
{
if (dx)
{
- int menu_navigation_type = (dx < 0 ? TYPE_LEAVE_MENU : TYPE_ENTER_MENU);
+ int menu_navigation_type = (dx < 0 ? TYPE_LEAVE : TYPE_ENTER);
if (info_info[choice].type & menu_navigation_type ||
info_info[choice].type & TYPE_ENTER_SCREEN ||
DrawTextSCentered(ystart + 1 * ystep, FONT_TEXT_2,
"If you like it, send e-mail to:");
DrawTextSCentered(ystart + 2 * ystep, FONT_TEXT_3,
- "info@artsoft.org");
+ PROGRAM_EMAIL_STRING);
DrawTextSCentered(ystart + 3 * ystep, FONT_TEXT_2,
"or SnailMail to:");
DrawTextSCentered(ystart + 4 * ystep + 0, FONT_TEXT_3,
"33604 Bielefeld");
DrawTextSCentered(ystart + 4 * ystep + 60, FONT_TEXT_3,
"Germany");
-
DrawTextSCentered(ystart + 7 * ystep, FONT_TEXT_2,
+ "More information and levels:");
+ DrawTextSCentered(ystart + 8 * ystep, FONT_TEXT_3,
+ PROGRAM_WEBSITE_STRING);
+ DrawTextSCentered(ystart + 9 * ystep, FONT_TEXT_2,
"If you have created new levels,");
- DrawTextSCentered(ystart + 8 * ystep, FONT_TEXT_2,
+ DrawTextSCentered(ystart + 10 * ystep, FONT_TEXT_2,
"send them to me to include them!");
- DrawTextSCentered(ystart + 9 * ystep, FONT_TEXT_2,
+ DrawTextSCentered(ystart + 11 * ystep, FONT_TEXT_2,
":-)");
DrawTextSCentered(ybottom, FONT_TEXT_4,
for (i = 0; video.fullscreen_modes[i].width != -1; i++)
{
TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED);
- char identifier[20], name[20];
+ char identifier[32], name[32];
int x = video.fullscreen_modes[i].width;
int y = video.fullscreen_modes[i].height;
+ int xx, yy;
+
+ get_aspect_ratio_from_screen_mode(&video.fullscreen_modes[i], &xx, &yy);
ti->node_top = &screen_modes;
- ti->sort_priority = x * y;
+ ti->sort_priority = x * 10000 + y;
sprintf(identifier, "%dx%d", x, y);
- sprintf(name, "%d x %d", x, y);
+ sprintf(name, "%d x %d [%d:%d]", x, y, xx, yy);
setString(&ti->identifier, identifier);
setString(&ti->name, name);
pushTreeInfo(&screen_modes, ti);
}
+ /* sort fullscreen modes to start with lowest available screen resolution */
sortTreeInfo(&screen_modes);
- /* set current screen mode for fullscreen mode to reliable default value */
+ /* set current screen mode for fullscreen mode to configured setup value */
screen_mode_current = getTreeInfoFromIdentifier(screen_modes,
- DEFAULT_FULLSCREEN_MODE);
+ setup.fullscreen_mode);
+
+ /* if that fails, set current screen mode to reliable default value */
+ if (screen_mode_current == NULL)
+ screen_mode_current = getTreeInfoFromIdentifier(screen_modes,
+ DEFAULT_FULLSCREEN_MODE);
+
+ /* if that also fails, set current screen mode to first available mode */
if (screen_mode_current == NULL)
screen_mode_current = screen_modes;
choice_store[setup_mode] = choice;
drawCursor(choice, FC_RED);
+
return;
}
else if (button == MB_MENU_LEAVE)
void (*menu_callback_function)(void) = setup_info[y].value;
menu_callback_function();
+
break; /* absolutely needed because function changes 'setup_info'! */
}
}
{
if (dx)
{
- int menu_navigation_type = (dx < 0 ? TYPE_LEAVE_MENU : TYPE_ENTER_MENU);
+ int menu_navigation_type = (dx < 0 ? TYPE_LEAVE : TYPE_ENTER);
if (setup_info[choice].type & menu_navigation_type ||
setup_info[choice].type & TYPE_BOOLEAN_STYLE)
y += dy;
}
+#if 1
+ if (IN_VIS_FIELD(x, y) && y >= 0 && y < num_setup_info)
+ {
+ if (button)
+ {
+ if (y != choice && setup_info[y].type & ~TYPE_SKIP_ENTRY)
+ {
+ drawCursor(y, FC_RED);
+ drawCursor(choice, FC_BLUE);
+ choice = choice_store[setup_mode] = y;
+ }
+ }
+ else if (!(setup_info[y].type & TYPE_GHOSTED))
+ {
+ /* when selecting key headline, execute function for key value change */
+ if (setup_info[y].type & TYPE_KEYTEXT &&
+ setup_info[y + 1].type & TYPE_KEY)
+ y++;
+
+ /* when selecting string value, execute function for list selection */
+ if (setup_info[y].type & TYPE_STRING && y > 0 &&
+ setup_info[y - 1].type & TYPE_ENTER_LIST)
+ y--;
+
+ if (setup_info[y].type & TYPE_ENTER_OR_LEAVE)
+ {
+ void (*menu_callback_function)(void) = setup_info[y].value;
+
+ menu_callback_function();
+ }
+ else
+ {
+ if (setup_info[y].type & TYPE_VALUE)
+ changeSetupValue(y);
+ }
+ }
+ }
+#else
if (IN_VIS_FIELD(x, y) &&
y >= 0 && y < num_setup_info && setup_info[y].type & ~TYPE_SKIP_ENTRY)
{
}
}
}
+#endif
}
void DrawSetupScreen_Input()
projects / rocksndiamonds.git / blobdiff