if (leveldir_current != leveldir_last_valid)
{
+ // level setup config may have been loaded to "last played" tree node copy,
+ // but "leveldir_current" now points to the "original" level set tree node,
+ // in which case "handicap_level" may still default to the first level
+ LoadLevelSetup_SeriesInfo();
+
UpdateLastPlayedLevels_TreeInfo();
levelset_has_changed = TRUE;
static boolean TitleAutoDelayReached(unsigned int *counter_var,
struct TitleFadingInfo *fi)
{
- return DelayReachedExt(counter_var, fi->auto_delay, getAutoDelayCounter(fi));
+ return DelayReachedExt2(counter_var, fi->auto_delay, getAutoDelayCounter(fi));
}
static void ResetTitleAutoDelay(unsigned int *counter_var,
void HandleInfoScreen_Elements(int dx, int dy, int button)
{
- static unsigned int info_delay = 0;
+ static DelayCounter info_delay = { 0 };
static int num_anims;
static int num_pages;
static int page;
int anims_per_page = NUM_INFO_ELEMENTS_ON_SCREEN;
int i;
+ info_delay.value = GameFrameDelay;
+
if (button == MB_MENU_INITIALIZE)
{
boolean new_element = TRUE;
}
else
{
- if (DelayReached(&info_delay, GameFrameDelay))
+ if (DelayReached(&info_delay))
if (page < num_pages)
DrawInfoScreen_HelpAnim(page * anims_per_page, num_anims, FALSE);
return align_yoffset;
}
+static void StartPlayingFromHallOfFame(void)
+{
+ level_nr = scores.next_level_nr;
+ LoadLevel(level_nr);
+
+ StartGameActions(network.enabled, setup.autorecord, level.random_seed);
+}
+
static void DrawChooseTree(TreeInfo **ti_ptr)
{
int fade_mask = REDRAW_FIELD;
boolean restart_music = (game_status != game_status_last_screen &&
game_status_last_screen != GAME_MODE_SCOREINFO);
+ scores.continue_on_return = (game_status == GAME_MODE_SCORES &&
+ game_status_last_screen == GAME_MODE_PLAYING);
+
if (CheckFadeAll())
fade_mask = REDRAW_ALL;
{
execSetupArtwork();
}
- else // GAME_MODE_LEVELS
+ else if (game_status == GAME_MODE_SCORES && scores.continue_playing)
+ {
+ StartPlayingFromHallOfFame();
+ }
+ else
{
SetGameStatus(GAME_MODE_MAIN);
}
#if defined(PLATFORM_ANDROID)
- // touching the screen anywhere continues playing the next level
- if ((mx || my) && scores.continue_playing)
+ // directly continue when touching the screen after playing
+ if ((mx || my) && scores.continue_on_return)
{
+ // ignore touch events until released
mx = my = 0;
- button = MB_MENU_CHOICE;
}
#endif
node_cursor->cl_first = ti->cl_first;
node_cursor->cl_cursor = ti->cl_cursor;
+
*ti_ptr = node_cursor->node_group;
DrawChooseTree(ti_ptr);
return;
}
}
- else if (dx == -1 && ti->node_parent)
+ else if ((dx == -1 || button == MB_MENU_CONTINUE) && ti->node_parent)
{
- FadeSetLeaveMenu();
+ if (game_status != GAME_MODE_SCORES)
+ FadeSetLeaveMenu();
PlaySound(SND_MENU_ITEM_SELECTING);
node_cursor->cl_first = ti->cl_first;
node_cursor->cl_cursor = ti->cl_cursor;
+
*ti_ptr = node_cursor->node_group;
DrawChooseTree(ti_ptr);
}
node_cursor->cl_first = ti->cl_first;
node_cursor->cl_cursor = ti->cl_cursor;
+
*ti_ptr = node_cursor;
if (ti->type == TREE_TYPE_LEVEL_DIR)
{
if (scores.continue_playing && scores.continue_on_return)
{
- StartGameActions(network.enabled, setup.autorecord,
- level.random_seed);
+ StartPlayingFromHallOfFame();
+
return;
}
else if (!scores.continue_on_return)
if (score_entry_current == NULL)
score_entry_current = getFirstValidTreeInfoEntry(score_entries);
+ if (score_entries != NULL && scores.continue_playing)
+ setString(&score_entries->node_group->name, BACKLINK_TEXT_NEXT);
+
// ("score_entries" and "score_entry_current" may be NULL here)
}
void DrawHallOfFame(int nr)
{
scores.last_level_nr = nr;
- scores.continue_on_return = (game_status_last_screen == GAME_MODE_PLAYING);
// (this is needed when called from GameEnd() after winning a game)
KeyboardAutoRepeatOn();
runtime.use_api_server = setup.use_api_server;
if (runtime.use_api_server)
+ {
+ if (setup.has_remaining_tapes)
+ setup.ask_for_uploading_tapes = TRUE;
+
CheckApiServerTasks();
+ }
}
static void ModifyGameSpeedIfNeeded(void)
static struct TokenInfo setup_info_graphics[] =
{
-#if !defined(PLATFORM_ANDROID)
+#if !defined(PLATFORM_ANDROID) && !defined(PLATFORM_EMSCRIPTEN)
{ TYPE_SWITCH, &setup.fullscreen, "Fullscreen:" },
{ TYPE_ENTER_LIST, execSetupChooseWindowSize, "Window Scaling:" },
{ TYPE_STRING, &window_size_text, "" },
{ TYPE_ENTER_LIST, execSetupChooseScrollDelay, "Scroll Delay:" },
{ TYPE_STRING, &scroll_delay_text, "" },
#endif
+#if !defined(PLATFORM_EMSCRIPTEN)
{ TYPE_ENTER_LIST, execSetupChooseVsyncMode, "Vertical Sync (VSync):" },
{ TYPE_STRING, &vsync_mode_text, "" },
+#endif
{ TYPE_SWITCH, &setup.fade_screens, "Fade Screens:" },
{ TYPE_SWITCH, &setup.quick_switch, "Quick Player Focus Switch:" },
{ TYPE_SWITCH, &setup.quick_doors, "Quick Menu Doors:" },
while (!finished)
{
Event event;
+ DelayCounter event_frame_delay = { GAME_FRAME_DELAY };
- if (NextValidEvent(&event))
+ // reset frame delay counter directly after updating screen
+ ResetDelayCounter(&event_frame_delay);
+
+ while (NextValidEvent(&event))
{
switch (event.type)
{
HandleOtherEvents(&event);
break;
}
+
+ // do not handle events for longer than standard frame delay period
+ if (DelayReached(&event_frame_delay))
+ break;
}
BackToFront();
int font_height = getFontHeight(font_nr);
int ypos1 = SYSIZE / 2 - font_height * 2;
int ypos2 = SYSIZE / 2 - font_height * 1;
- unsigned int wait_frame_delay = 0;
- unsigned int wait_frame_delay_value = 2000;
+ DelayCounter wait_frame_delay = { 2000 };
ResetDelayCounter(&wait_frame_delay);
DrawTextSCentered(ypos1, font_nr, "Keyboard");
DrawTextSCentered(ypos2, font_nr, "configured!");
- while (!DelayReached(&wait_frame_delay, wait_frame_delay_value))
+ while (!DelayReached(&wait_frame_delay))
BackToFront();
ClearEventQueue();
{ 282, 210, MARKER_AXIS_Y, "righty", },
};
- unsigned int event_frame_delay = 0;
- unsigned int event_frame_delay_value = GAME_FRAME_DELAY;
-
- ResetDelayCounter(&event_frame_delay);
-
if (!bitmaps_initialized)
{
controller = LoadCustomImage("joystick/controller.png");
screen_initialized = TRUE;
+ DelayCounter event_frame_delay = { GAME_FRAME_DELAY };
+
+ // reset frame delay counter directly after updating screen
+ ResetDelayCounter(&event_frame_delay);
+
while (NextValidEvent(&event))
{
switch (event.type)
}
// do not handle events for longer than standard frame delay period
- if (DelayReached(&event_frame_delay, event_frame_delay_value))
+ if (DelayReached(&event_frame_delay))
break;
}
}
int font_height = getFontHeight(font_nr);
int ypos1 = SYSIZE / 2 - font_height * 2;
int ypos2 = SYSIZE / 2 - font_height * 1;
- unsigned int wait_frame_delay = 0;
- unsigned int wait_frame_delay_value = 2000;
+ DelayCounter wait_frame_delay = { 2000 };
ResetDelayCounter(&wait_frame_delay);
DrawTextSCentered(ypos1, font_nr, message1);
DrawTextSCentered(ypos2, font_nr, message2);
- while (!DelayReached(&wait_frame_delay, wait_frame_delay_value))
+ while (!DelayReached(&wait_frame_delay))
BackToFront();
ClearEventQueue();
int font_height = getFontHeight(font_nr);
int ypos1 = SYSIZE / 2 - font_height * 2;
int ypos2 = SYSIZE / 2 - font_height * 1;
- unsigned int wait_frame_delay = 0;
- unsigned int wait_frame_delay_value = 2000;
+ DelayCounter wait_frame_delay = { 2000 };
ResetDelayCounter(&wait_frame_delay);
DrawTextSCentered(ypos1, font_nr, "Virtual buttons");
DrawTextSCentered(ypos2, font_nr, "configured!");
- while (!DelayReached(&wait_frame_delay, wait_frame_delay_value))
+ while (!DelayReached(&wait_frame_delay))
BackToFront();
ClearEventQueue();
int type = GD_TYPE_NORMAL_BUTTON;
boolean checked = FALSE;
+ // do not use touch buttons if overlay touch buttons are disabled
+ if (is_touch_button && !setup.touch.overlay_buttons)
+ continue;
+
event_mask = menubutton_info[i].event_mask;
x = (is_touch_button ? pos->x : mSX + GDI_ACTIVE_POS(pos->x));
"Upload all your tapes to the high score server now?", REQ_ASK))
return FALSE;
+ // when uploading tapes, make sure that high score server is enabled
+ runtime.use_api_server = setup.use_api_server = TRUE;
+
int num_tapes_uploaded = UploadTapes();
char message[100];