#define SETUP_MODE_SHORTCUT_2 6
#define SETUP_MODE_GRAPHICS 7
#define SETUP_MODE_CHOOSE_SCREEN_MODE 8
-#define SETUP_MODE_SOUND 9
-#define SETUP_MODE_ARTWORK 10
-#define SETUP_MODE_CHOOSE_GRAPHICS 11
-#define SETUP_MODE_CHOOSE_SOUNDS 12
-#define SETUP_MODE_CHOOSE_MUSIC 13
+#define SETUP_MODE_CHOOSE_SCROLL_DELAY 9
+#define SETUP_MODE_SOUND 10
+#define SETUP_MODE_ARTWORK 11
+#define SETUP_MODE_CHOOSE_GRAPHICS 12
+#define SETUP_MODE_CHOOSE_SOUNDS 13
+#define SETUP_MODE_CHOOSE_MUSIC 14
-#define MAX_SETUP_MODES 14
+#define MAX_SETUP_MODES 15
/* for input setup functions */
#define SETUPINPUT_SCREEN_POS_START 0
static TreeInfo *screen_modes = NULL;
static TreeInfo *screen_mode_current = NULL;
+static TreeInfo *scroll_delays = NULL;
+static TreeInfo *scroll_delay_current = NULL;
+
static TreeInfo *game_speeds = NULL;
static TreeInfo *game_speed_current = NULL;
{ -1, NULL },
};
-#define XFADE 1
+static struct
+{
+ int value;
+ char *text;
+} scroll_delays_list[] =
+{
+ { 0, "0 Tiles (No Scroll Delay)" },
+ { 1, "1 Tile" },
+ { 2, "2 Tiles" },
+ { 3, "3 Tiles (Default)" },
+ { 4, "4 Tiles" },
+ { 5, "5 Tiles" },
+ { 6, "6 Tiles" },
+ { 7, "7 Tiles" },
+ { 8, "8 Tiles (Maximum Scroll Delay)"},
+
+ { -1, NULL },
+};
#define DRAW_MODE(s) ((s) >= GAME_MODE_MAIN && \
(s) <= GAME_MODE_SETUP ? (s) : \
ti = (initial ? title_initial_default : title_default);
/* override default settings with image config settings, if defined */
- if (graphic_info[graphic].anim_mode != ANIM_DEFAULT)
- ti.anim_mode = graphic_info[graphic].anim_mode;
+ if (graphic_info[graphic].fade_mode != FADE_MODE_DEFAULT)
+ ti.fade_mode = graphic_info[graphic].fade_mode;
if (graphic_info[graphic].fade_delay > -1)
ti.fade_delay = graphic_info[graphic].fade_delay;
if (graphic_info[graphic].post_delay > -1)
{
if (initial)
{
- ti.anim_mode = titlemessage_initial[nr].anim_mode;
+ ti.fade_mode = titlemessage_initial[nr].fade_mode;
ti.fade_delay = titlemessage_initial[nr].fade_delay;
ti.post_delay = titlemessage_initial[nr].post_delay;
ti.auto_delay = titlemessage_initial[nr].auto_delay;
}
else
{
- ti.anim_mode = titlemessage[nr].anim_mode;
+ ti.fade_mode = titlemessage[nr].fade_mode;
ti.fade_delay = titlemessage[nr].fade_delay;
ti.post_delay = titlemessage[nr].post_delay;
ti.auto_delay = titlemessage[nr].auto_delay;
redraw_mask == REDRAW_ALL);
#endif
+ FadeSetLeaveScreen();
+
#if 1
-#if XFADE
- if (fading.anim_mode == ANIM_CROSSFADE)
- FadeCrossSaveBackbuffer();
- else
- FadeOut(redraw_mask);
-#endif
+ FadeOut(redraw_mask);
#endif
UnmapAllGadgets();
SetMainBackgroundImage(IMG_BACKGROUND_MAIN);
#if 0
-#if XFADE
- if (fading.anim_mode == ANIM_CROSSFADE)
- FadeCrossSaveBackbuffer();
- else
- FadeOut(redraw_mask);
-#endif
+ FadeOut(redraw_mask);
#endif
#if 1
if (redraw_mask == REDRAW_ALL)
{
+#if 0
int door_state = GetDoorState();
+#endif
RedrawBackground();
}
#endif
-#if XFADE
- if (fading.anim_mode == ANIM_CROSSFADE)
- FadeCross(redraw_mask);
- else
- FadeIn(redraw_mask);
+#if 0
+ {
+ game_status = GAME_MODE_PSEUDO_PREVIEW;
+
+ DrawText(20, 400, "text_3.PREVIEW", FONT_TEXT_3);
+ DrawText(20, 420, "text_4.PREVIEW", FONT_TEXT_4);
+
+ game_status = GAME_MODE_MAIN;
+
+ DrawText(20, 440, "text_3.MAIN", FONT_TEXT_3);
+ DrawText(20, 460, "text_4.MAIN", FONT_TEXT_4);
+ }
+#endif
+
+#if 1
+ FadeIn(redraw_mask);
#else
#if 1
if (!do_fading)
#endif
#if 1
- fading = menu.navigation;
+ FadeSetEnterMenu();
#else
fading = title_default;
#endif
#endif
#endif
struct TitleControlInfo *tci;
+ struct TitleFadingInfo fading_default;
+ struct TitleFadingInfo fading_last = fading;
struct TitleFadingInfo fading_next;
int sound, music;
if (button == MB_MENU_INITIALIZE)
{
-#if 1
+#if 0
boolean use_cross_fading = (fading.anim_mode == ANIM_CROSSFADE);
#endif
DrawInfoScreen_NotAvailable("Title screen information:",
"No title screen for this level set.");
+#if 0
/* use default settings for fading, but always disable auto delay */
fading = title_default;
fading.auto_delay = -1;
+#endif
return;
}
FadeSoundsAndMusic();
#if 1
- if (use_cross_fading)
- FadeCrossSaveBackbuffer();
- else
- FadeOut(REDRAW_ALL);
-#else
FadeOut(REDRAW_ALL);
#endif
}
else
DrawTitleScreenMessage(tci->local_nr, tci->initial);
- fading = getTitleFading(tci);
+ fading_default = (tci->initial ? title_initial_default : title_default);
+
+ fading = fading_next = getTitleFading(tci);
+
+#if 1
+#if 1
+ if (!(fading_last.fade_mode & FADE_TYPE_TRANSFORM) &&
+ fading_next.fade_mode & FADE_TYPE_TRANSFORM)
+ {
+ fading.fade_mode = FADE_MODE_FADE;
+ fading.fade_delay = fading_default.fade_delay;
+ }
+#else
+ if (fading_last.fade_mode != FADE_MODE_CROSSFADE &&
+ fading_next.fade_mode == FADE_MODE_CROSSFADE)
+ fading.fade_mode = FADE_MODE_FADE;
+#endif
+#endif
#if 1
sound = getTitleSound(tci);
SetMouseCursor(CURSOR_NONE);
+ // printf("::: mode: %d, delay: %d\n", fading.fade_mode, fading.fade_delay);
+
#if 1
- if (use_cross_fading)
- FadeCross(REDRAW_ALL);
- else
- FadeIn(REDRAW_ALL);
-#else
FadeIn(REDRAW_ALL);
#endif
+ fading = fading_next;
+
DelayReached(&title_delay, 0); /* reset delay counter */
return;
}
+#if 1
+ if (fading.auto_delay > 0 && DelayReached(&title_delay, fading.auto_delay))
+ button = MB_MENU_CHOICE;
+#else
if (fading.auto_delay > -1 && DelayReached(&title_delay, fading.auto_delay))
button = MB_MENU_CHOICE;
+#endif
if (button == MB_MENU_LEAVE)
{
}
else if (button == MB_MENU_CHOICE)
{
-#if 1
+#if 0
boolean use_cross_fading = (fading.anim_mode == ANIM_CROSSFADE);
#endif
if (game_status == GAME_MODE_INFO && num_title_screens == 0)
{
#if 0
-#if XFADE
- if (fading.anim_mode == ANIM_CROSSFADE)
- FadeCrossSaveBackbuffer();
- else
- FadeOut(REDRAW_FIELD);
-#else
FadeOut(REDRAW_FIELD);
-#endif
#endif
- fading = menu.destination;
+ FadeSetEnterScreen();
info_mode = INFO_MODE_MAIN;
DrawAndFadeInInfoScreen(REDRAW_FIELD);
if (music == MUS_UNDEFINED || music != last_music)
FadeMusic();
- if (use_cross_fading)
- FadeCrossSaveBackbuffer();
- else
- FadeOut(REDRAW_ALL);
+#if 1
+ FadeOut(REDRAW_ALL);
+#endif
if (tci->is_image)
DrawTitleScreenImage(tci->local_nr, tci->initial);
last_music = music;
#endif
+#if 0
+ printf("::: %d -> %d\n", fading.fade_mode, fading_next.fade_mode);
+#endif
+
+#if 1
+ /* last screen already faded out, next screen has no animation */
+ if (!(fading.fade_mode & FADE_TYPE_TRANSFORM) &&
+ fading_next.fade_mode == FADE_MODE_NONE)
+ fading = fading_next;
+#else
/* last screen already faded out, next screen has no animation */
- if (!use_cross_fading && fading_next.anim_mode == ANIM_NONE)
+ if (fading.fade_mode != FADE_MODE_CROSSFADE &&
+ fading_next.fade_mode == FADE_MODE_NONE)
fading = fading_next;
+#endif
- if (use_cross_fading)
- FadeCross(REDRAW_ALL);
- else
- FadeIn(REDRAW_ALL);
+#if 1
+ FadeIn(REDRAW_ALL);
+#endif
fading = fading_next;
boolean use_cross_fading = (fading.anim_mode == ANIM_CROSSFADE);
#endif
- if (use_cross_fading)
- FadeCrossSaveBackbuffer();
- else
- FadeOut(REDRAW_ALL);
+#if 1
+ FadeOut(REDRAW_ALL);
+#endif
}
#else
FadeOut(REDRAW_ALL);
game_status = GAME_MODE_EDITOR;
- fading = menu.destination;
+ FadeSetEnterScreen();
DrawLevelEd();
}
game_status = GAME_MODE_INFO;
info_mode = INFO_MODE_MAIN;
+#if 0
fading = menu.navigation;
+#endif
DrawInfoScreen();
}
static void execInfoTitleScreen()
{
- fading = menu.destination;
+#if 0
+ FadeSetEnterScreen();
+#endif
info_mode = INFO_MODE_TITLE;
DrawInfoScreen();
static void execInfoElements()
{
- fading = menu.destination;
+#if 0
+ FadeSetEnterScreen();
+#endif
info_mode = INFO_MODE_ELEMENTS;
DrawInfoScreen();
static void execInfoMusic()
{
- fading = menu.destination;
+#if 0
+ FadeSetEnterScreen();
+#endif
info_mode = INFO_MODE_MUSIC;
DrawInfoScreen();
static void execInfoCredits()
{
- fading = menu.destination;
+#if 0
+ FadeSetEnterScreen();
+#endif
info_mode = INFO_MODE_CREDITS;
DrawInfoScreen();
static void execInfoProgram()
{
- fading = menu.destination;
+#if 0
+ FadeSetEnterScreen();
+#endif
info_mode = INFO_MODE_PROGRAM;
DrawInfoScreen();
static void execInfoVersion()
{
- fading = menu.destination;
+#if 0
+ FadeSetEnterScreen();
+#endif
info_mode = INFO_MODE_VERSION;
DrawInfoScreen();
static void execInfoLevelSet()
{
- fading = menu.destination;
+#if 0
+ FadeSetEnterScreen();
+#endif
info_mode = INFO_MODE_LEVELSET;
DrawInfoScreen();
static void execExitInfo()
{
- fading = menu.navigation;
+#if 0
+ FadeSetLeaveMenu();
+#endif
game_status = GAME_MODE_MAIN;
#if 1
UnmapAllGadgets();
CloseDoor(DOOR_CLOSE_2);
-#if XFADE
- if (fading.anim_mode == ANIM_CROSSFADE)
- FadeCrossSaveBackbuffer();
- else
- FadeOut(redraw_mask);
+ /* (needed after displaying title screens which disable auto repeat) */
+ KeyboardAutoRepeatOn();
+
+ FadeSetLeaveScreen();
+
+#if 1
+ FadeOut(redraw_mask);
#endif
#if 1
PlayMenuSound();
PlayMenuMusic();
- DrawMaskedBorder(REDRAW_ALL);
+ DrawMaskedBorder(redraw_mask);
-#if XFADE
- if (fading.anim_mode == ANIM_CROSSFADE)
- FadeCross(redraw_mask);
- else
- FadeIn(redraw_mask);
+#if 1
+ FadeIn(redraw_mask);
#else
#if 1
if (!do_fading)
{
void (*menu_callback_function)(void) = info_info[y].value;
+ FadeSetLeaveMenu();
+
menu_callback_function();
break; /* absolutely needed because function changes 'info_info'! */
{
void (*menu_callback_function)(void) = info_info[choice].value;
+ FadeSetFromType(info_info[y].type);
+
menu_callback_function();
}
}
SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_LEVELSET);
-#if XFADE
- if (fading.anim_mode == ANIM_CROSSFADE)
- FadeCrossSaveBackbuffer();
- else
- FadeOut(REDRAW_FIELD);
-#else
+#if 1
FadeOut(REDRAW_FIELD);
#endif
DrawTextSCentered(ybottom, FONT_TEXT_4,
"Press any key or button for info menu");
-#if XFADE
- if (fading.anim_mode == ANIM_CROSSFADE)
- FadeCross(REDRAW_FIELD);
- else
- FadeIn(REDRAW_FIELD);
-#else
+#if 1
FadeIn(REDRAW_FIELD);
#endif
}
{
SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_ELEMENTS);
-#if XFADE
- if (fading.anim_mode == ANIM_CROSSFADE)
- FadeCrossSaveBackbuffer();
- else
- FadeOut(REDRAW_FIELD);
-#else
+#if 1
FadeOut(REDRAW_FIELD);
#endif
HandleInfoScreen_Elements(MB_MENU_INITIALIZE);
-#if XFADE
- if (fading.anim_mode == ANIM_CROSSFADE)
- FadeCross(REDRAW_FIELD);
- else
- FadeIn(REDRAW_FIELD);
-#else
+#if 1
FadeIn(REDRAW_FIELD);
#endif
FadeSoundsAndMusic();
#if 0
-#if XFADE
- if (fading.anim_mode == ANIM_CROSSFADE)
- FadeCrossSaveBackbuffer();
- else
- FadeOut(REDRAW_FIELD);
-#else
FadeOut(REDRAW_FIELD);
-#endif
#endif
info_mode = INFO_MODE_MAIN;
{
SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_MUSIC);
-#if XFADE
- if (fading.anim_mode == ANIM_CROSSFADE)
- FadeCrossSaveBackbuffer();
- else
- FadeOut(REDRAW_FIELD);
-#else
+#if 1
FadeOut(REDRAW_FIELD);
#endif
HandleInfoScreen_Music(MB_MENU_INITIALIZE);
-#if XFADE
- if (fading.anim_mode == ANIM_CROSSFADE)
- FadeCross(REDRAW_FIELD);
- else
- FadeIn(REDRAW_FIELD);
-#else
+#if 1
FadeIn(REDRAW_FIELD);
#endif
}
FadeSoundsAndMusic();
#if 0
-#if XFADE
- if (fading.anim_mode == ANIM_CROSSFADE)
- FadeCrossSaveBackbuffer();
- else
- FadeOut(REDRAW_FIELD);
-#else
FadeOut(REDRAW_FIELD);
-#endif
#endif
info_mode = INFO_MODE_MAIN;
FadeSoundsAndMusic();
-#if XFADE
- if (fading.anim_mode == ANIM_CROSSFADE)
- FadeCrossSaveBackbuffer();
- else
- FadeOut(REDRAW_FIELD);
-#else
+#if 1
FadeOut(REDRAW_FIELD);
#endif
HandleInfoScreen_Credits(MB_MENU_INITIALIZE);
-#if XFADE
- if (fading.anim_mode == ANIM_CROSSFADE)
- FadeCross(REDRAW_FIELD);
- else
- FadeIn(REDRAW_FIELD);
-#else
+#if 1
FadeIn(REDRAW_FIELD);
#endif
}
FadeSoundsAndMusic();
#if 0
-#if XFADE
- if (fading.anim_mode == ANIM_CROSSFADE)
- FadeCrossSaveBackbuffer();
- else
- FadeOut(REDRAW_FIELD);
-#else
FadeOut(REDRAW_FIELD);
-#endif
#endif
info_mode = INFO_MODE_MAIN;
SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_PROGRAM);
-#if XFADE
- if (fading.anim_mode == ANIM_CROSSFADE)
- FadeCrossSaveBackbuffer();
- else
- FadeOut(REDRAW_FIELD);
-#else
+#if 1
FadeOut(REDRAW_FIELD);
#endif
DrawTextSCentered(ybottom, FONT_TEXT_4,
"Press any key or button for info menu");
-#if XFADE
- if (fading.anim_mode == ANIM_CROSSFADE)
- FadeCross(REDRAW_FIELD);
- else
- FadeIn(REDRAW_FIELD);
-#else
+#if 1
FadeIn(REDRAW_FIELD);
#endif
}
FadeSoundsAndMusic();
#if 0
-#if XFADE
- if (fading.anim_mode == ANIM_CROSSFADE)
- FadeCrossSaveBackbuffer();
- else
- FadeOut(REDRAW_FIELD);
-#else
FadeOut(REDRAW_FIELD);
-#endif
#endif
info_mode = INFO_MODE_MAIN;
SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_VERSION);
-#if XFADE
- if (fading.anim_mode == ANIM_CROSSFADE)
- FadeCrossSaveBackbuffer();
- else
- FadeOut(REDRAW_FIELD);
-#else
+#if 1
FadeOut(REDRAW_FIELD);
#endif
DrawTextSCentered(ybottom, FONT_TEXT_4,
"Press any key or button for info menu");
-#if XFADE
- if (fading.anim_mode == ANIM_CROSSFADE)
- FadeCross(REDRAW_FIELD);
- else
- FadeIn(REDRAW_FIELD);
-#else
+#if 1
FadeIn(REDRAW_FIELD);
#endif
}
FadeSoundsAndMusic();
#if 0
-#if XFADE
- if (fading.anim_mode == ANIM_CROSSFADE)
- FadeCrossSaveBackbuffer();
- else
- FadeOut(REDRAW_FIELD);
-#else
FadeOut(REDRAW_FIELD);
-#endif
#endif
info_mode = INFO_MODE_MAIN;
SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_LEVELSET);
-#if XFADE
- if (fading.anim_mode == ANIM_CROSSFADE)
- FadeCrossSaveBackbuffer();
- else
- FadeOut(REDRAW_FIELD);
-#else
+#if 1
FadeOut(REDRAW_FIELD);
#endif
DrawTextCentered(mSY + SYSIZE - 20, FONT_TEXT_4,
"Press any key or button for info menu");
-#if XFADE
- if (fading.anim_mode == ANIM_CROSSFADE)
- FadeCross(REDRAW_FIELD);
- else
- FadeIn(REDRAW_FIELD);
-#else
+#if 1
FadeIn(REDRAW_FIELD);
#endif
}
FadeSoundsAndMusic();
#if 0
-#if XFADE
- if (fading.anim_mode == ANIM_CROSSFADE)
- FadeCrossSaveBackbuffer();
- else
- FadeOut(REDRAW_FIELD);
-#else
FadeOut(REDRAW_FIELD);
-#endif
#endif
info_mode = INFO_MODE_MAIN;
void DrawInfoScreen()
{
- DrawInfoScreenExt(REDRAW_ALL, FALSE);
+ DrawInfoScreenExt(REDRAW_FIELD, FALSE);
}
void HandleInfoScreen(int mx, int my, int dx, int dy, int button)
CloseDoor(DOOR_CLOSE_2);
-#if XFADE
- if (fading.anim_mode == ANIM_CROSSFADE)
- FadeCrossSaveBackbuffer();
- else
- FadeOut(REDRAW_FIELD);
+#if 1
+ FadeOut(REDRAW_FIELD);
#endif
ClearWindow();
HandleChooseTree(0, 0, 0, 0, MB_MENU_INITIALIZE, ti_ptr);
MapScreenTreeGadgets(*ti_ptr);
-#if XFADE
- if (fading.anim_mode == ANIM_CROSSFADE)
- FadeCross(redraw_mask);
- else
- FadeIn(redraw_mask);
-#else
- FadeToFront();
+#if 1
+ FadeIn(REDRAW_FIELD);
#endif
InitAnimation();
}
else if (button == MB_MENU_LEAVE)
{
+ FadeSetLeaveMenu();
+
PlaySound(SND_MENU_ITEM_SELECTING);
if (ti->node_parent)
{
if (setup_mode == SETUP_MODE_CHOOSE_GAME_SPEED)
execSetupGame();
- else if (setup_mode == SETUP_MODE_CHOOSE_SCREEN_MODE)
+ else if (setup_mode == SETUP_MODE_CHOOSE_SCREEN_MODE ||
+ setup_mode == SETUP_MODE_CHOOSE_SCROLL_DELAY)
execSetupGraphics();
else
execSetupArtwork();
if (node_cursor->node_group)
{
+ FadeSetEnterMenu();
+
PlaySound(SND_MENU_ITEM_SELECTING);
node_cursor->cl_first = ti->cl_first;
}
else if (dx == -1 && ti->node_parent)
{
+ FadeSetLeaveMenu();
+
PlaySound(SND_MENU_ITEM_SELECTING);
*ti_ptr = ti->node_parent;
if (node_cursor->node_group)
{
+ FadeSetEnterMenu();
+
node_cursor->cl_first = ti->cl_first;
node_cursor->cl_cursor = ti->cl_cursor;
*ti_ptr = node_cursor->node_group;
}
else if (node_cursor->parent_link)
{
+ FadeSetLeaveMenu();
+
*ti_ptr = node_cursor->node_parent;
DrawChooseTree(ti_ptr);
}
else
{
+ FadeSetEnterScreen();
+
node_cursor->cl_first = ti->cl_first;
node_cursor->cl_cursor = ti->cl_cursor;
*ti_ptr = node_cursor;
{
if (setup_mode == SETUP_MODE_CHOOSE_GAME_SPEED)
execSetupGame();
- else if (setup_mode == SETUP_MODE_CHOOSE_SCREEN_MODE)
+ else if (setup_mode == SETUP_MODE_CHOOSE_SCREEN_MODE ||
+ setup_mode == SETUP_MODE_CHOOSE_SCROLL_DELAY)
execSetupGraphics();
else
execSetupArtwork();
if (highlight_position < 0)
LoadScore(level_nr);
- fading = menu.destination;
+ FadeSetEnterScreen();
-#if XFADE
- if (fading.anim_mode == ANIM_CROSSFADE)
- FadeCrossSaveBackbuffer();
- else
- FadeOut(REDRAW_FIELD);
-#else
+ // printf("::: %d: %d\n", game_status, menu.enter_screen[game_status]);
+
+#if 1
FadeOut(REDRAW_FIELD);
#endif
HandleHallOfFame(highlight_position, 0, 0, 0, MB_MENU_INITIALIZE);
-#if XFADE
- if (fading.anim_mode == ANIM_CROSSFADE)
- FadeCross(REDRAW_FIELD);
- else
- FadeIn(REDRAW_FIELD);
-#else
+#if 1
FadeIn(REDRAW_FIELD);
#endif
}
FadeSound(SND_BACKGROUND_SCORES);
#if 0
-#if XFADE
- if (fading.anim_mode == ANIM_CROSSFADE)
- FadeCrossSaveBackbuffer();
- else
- FadeOut(REDRAW_FIELD);
-#else
FadeOut(REDRAW_FIELD);
-#endif
#endif
game_status = GAME_MODE_MAIN;
static int num_setup_info;
static char *screen_mode_text;
+static char *scroll_delay_text;
static char *game_speed_text;
static char *graphics_set_name;
static char *sounds_set_name;
static void execSetupMain()
{
+#if 0
+ FadeSetLeaveMenu();
+#endif
+
setup_mode = SETUP_MODE_MAIN;
DrawSetupScreen();
}
static void execSetupGame()
{
+#if 0
+ FadeSetEnterMenu();
+#endif
+
if (game_speeds == NULL)
{
int i;
static void execSetupChooseGameSpeed()
{
+#if 0
+ FadeSetEnterMenu();
+#endif
+
setup_mode = SETUP_MODE_CHOOSE_GAME_SPEED;
DrawSetupScreen();
}
static void execSetupEditor()
{
+#if 0
+ FadeSetEnterMenu();
+#endif
+
setup_mode = SETUP_MODE_EDITOR;
DrawSetupScreen();
}
static void execSetupGraphics()
{
+#if 0
+ FadeSetEnterMenu();
+#endif
+
if (video.fullscreen_available && screen_modes == NULL)
{
int i;
screen_mode_text = screen_mode_current->name;
}
+#if 1
+ if (scroll_delays == NULL)
+ {
+ int i;
+
+ for (i = 0; scroll_delays_list[i].value != -1; i++)
+ {
+ TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED);
+ char identifier[32], name[32];
+ int value = scroll_delays_list[i].value;
+ char *text = scroll_delays_list[i].text;
+
+ ti->node_top = &scroll_delays;
+ 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, "Scroll Delay");
+
+ pushTreeInfo(&scroll_delays, ti);
+ }
+
+ /* sort scroll delay values to start with lowest scroll delay value */
+ sortTreeInfo(&scroll_delays);
+
+ /* 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 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 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 scroll delay text instead of identifier */
+ scroll_delay_text = scroll_delay_current->name;
+#endif
+
setup_mode = SETUP_MODE_GRAPHICS;
DrawSetupScreen();
}
static void execSetupChooseScreenMode()
{
+#if 0
+ FadeSetEnterMenu();
+#endif
+
if (!video.fullscreen_available)
return;
DrawSetupScreen();
}
+static void execSetupChooseScrollDelay()
+{
+#if 0
+ FadeSetEnterMenu();
+#endif
+
+ setup_mode = SETUP_MODE_CHOOSE_SCROLL_DELAY;
+ DrawSetupScreen();
+}
+
static void execSetupSound()
{
+#if 0
+ FadeSetEnterMenu();
+#endif
+
setup_mode = SETUP_MODE_SOUND;
DrawSetupScreen();
}
static void execSetupArtwork()
{
+#if 0
+ FadeSetEnterMenu();
+#endif
+
setup.graphics_set = artwork.gfx_current->identifier;
setup.sounds_set = artwork.snd_current->identifier;
setup.music_set = artwork.mus_current->identifier;
static void execSetupChooseGraphics()
{
+#if 0
+ FadeSetEnterMenu();
+#endif
+
setup_mode = SETUP_MODE_CHOOSE_GRAPHICS;
DrawSetupScreen();
}
static void execSetupChooseSounds()
{
+#if 0
+ FadeSetEnterMenu();
+#endif
+
setup_mode = SETUP_MODE_CHOOSE_SOUNDS;
DrawSetupScreen();
}
static void execSetupChooseMusic()
{
+#if 0
+ FadeSetEnterMenu();
+#endif
+
setup_mode = SETUP_MODE_CHOOSE_MUSIC;
DrawSetupScreen();
}
static void execSetupInput()
{
+#if 0
+ FadeSetEnterMenu();
+#endif
+
setup_mode = SETUP_MODE_INPUT;
DrawSetupScreen();
}
static void execSetupShortcut1()
{
+#if 0
+ FadeSetEnterMenu();
+#endif
+
setup_mode = SETUP_MODE_SHORTCUT_1;
DrawSetupScreen();
}
static void execSetupShortcut2()
{
+#if 0
+ FadeSetEnterMenu();
+#endif
+
setup_mode = SETUP_MODE_SHORTCUT_2;
DrawSetupScreen();
}
static void execExitSetup()
{
+#if 0
+ FadeSetLeaveMenu();
+#endif
+
game_status = GAME_MODE_MAIN;
#if 1
DrawMainMenuExt(REDRAW_FIELD, FALSE);
{ TYPE_SWITCH, &setup.fullscreen, "Fullscreen:" },
{ TYPE_ENTER_LIST, execSetupChooseScreenMode, "Fullscreen Mode:" },
{ TYPE_STRING, &screen_mode_text, "" },
- { TYPE_SWITCH, &setup.scroll_delay, "Delayed Scrolling:" },
+#if 0
+ { TYPE_SWITCH, &setup.scroll_delay, "Scroll Delay:" },
+#endif
+ { TYPE_ENTER_LIST, execSetupChooseScrollDelay, "Scroll Delay Value:" },
+ { TYPE_STRING, &scroll_delay_text, "" },
#if 0
{ TYPE_SWITCH, &setup.soft_scrolling, "Soft Scrolling:" },
{ TYPE_SWITCH, &setup.double_buffering,"Double-Buffering:" },
UnmapAllGadgets();
CloseDoor(DOOR_CLOSE_2);
-#if XFADE
- if (fading.anim_mode == ANIM_CROSSFADE)
- FadeCrossSaveBackbuffer();
- else
- FadeOut(REDRAW_FIELD);
+#if 1
+ FadeOut(REDRAW_FIELD);
#endif
ClearWindow();
HandleSetupScreen_Generic(0, 0, 0, 0, MB_MENU_INITIALIZE);
#endif
-#if XFADE
- if (fading.anim_mode == ANIM_CROSSFADE)
- FadeCross(redraw_mask);
- else
- FadeIn(redraw_mask);
-#else
- FadeToFront();
+#if 1
+ FadeIn(REDRAW_FIELD);
#endif
InitAnimation();
{
void (*menu_callback_function)(void) = setup_info[y].value;
+ FadeSetLeaveMenu();
+
menu_callback_function();
break; /* absolutely needed because function changes 'setup_info'! */
{
void (*menu_callback_function)(void) = setup_info[y].value;
+ FadeSetFromType(setup_info[y].type);
+
menu_callback_function();
}
else
int i;
#endif
-#if XFADE
- if (fading.anim_mode == ANIM_CROSSFADE)
- FadeCrossSaveBackbuffer();
- else
- FadeOut(REDRAW_FIELD);
+#if 1
+ FadeOut(REDRAW_FIELD);
#endif
ClearWindow();
HandleSetupScreen_Input(0, 0, 0, 0, MB_MENU_INITIALIZE);
-#if XFADE
- if (fading.anim_mode == ANIM_CROSSFADE)
- FadeCross(redraw_mask);
- else
- FadeIn(redraw_mask);
-#else
- FadeToFront();
+#if 1
+ FadeIn(REDRAW_FIELD);
#endif
InitAnimation();
{
InitJoysticks();
+ FadeSetLeaveMenu();
+
setup_mode = SETUP_MODE_MAIN;
DrawSetupScreen();
}
/* read existing key bindings from player setup */
custom_key = setup.input[player_nr].key;
+ FadeSetEnterMenu();
+ FadeOut(REDRAW_FIELD);
+
ClearWindow();
DrawTextSCentered(mSY - SY + 16, FONT_TITLE_1, "Keyboard Input");
+#if 0
BackToFront();
InitAnimation();
+#endif
step_nr = 0;
DrawText(mSX, mSY + (2 + 2 * step_nr) * 32,
DrawText(mSX + 4 * 32, mSY + (2 + 2 * step_nr + 1) * 32,
getKeyNameFromKey(*customize_step[step_nr].key), FONT_VALUE_OLD);
+#if 1
+ FadeIn(REDRAW_FIELD);
+
+ InitAnimation();
+#endif
+
while (!finished)
{
if (PendingEvent()) /* got event */
if (key == KSYM_Escape || (key == KSYM_Return && step_nr == 6))
{
+ if (key == KSYM_Escape)
+ FadeSkipNextFadeIn();
+
finished = TRUE;
break;
}
if (joystick_fd < 0 || !setup.input[player_nr].use_joystick)
return FALSE;
+ FadeSetEnterMenu();
+ FadeOut(REDRAW_FIELD);
+
ClearWindow();
for (y = 0; y < 3; y++)
new_joystick_ymiddle = joy_y;
DrawGraphic(xpos + last_x, ypos + last_y, IMG_MENU_CALIBRATE_RED, 0);
+
+#if 1
+ FadeIn(REDRAW_FIELD);
+#else
BackToFront();
+#endif
while (Joystick(player_nr) & JOY_BUTTON); /* wait for released button */
InitAnimation();
break;
case KSYM_Escape:
+ FadeSkipNextFadeIn();
result = 0;
break;
DrawChooseTree(&game_speed_current);
else if (setup_mode == SETUP_MODE_CHOOSE_SCREEN_MODE)
DrawChooseTree(&screen_mode_current);
+ else if (setup_mode == SETUP_MODE_CHOOSE_SCROLL_DELAY)
+ DrawChooseTree(&scroll_delay_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, &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_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.gfx_current);
else if (setup_mode == SETUP_MODE_CHOOSE_SOUNDS)
projects / rocksndiamonds.git / blobdiff