#define SETUP_MODE_CHOOSE_WINDOW_SIZE 19
#define SETUP_MODE_CHOOSE_SCALING_TYPE 20
#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 SETUP_MODE_CHOOSE_VSYNC 22
+#define SETUP_MODE_CHOOSE_GRAPHICS 23
+#define SETUP_MODE_CHOOSE_SOUNDS 24
+#define SETUP_MODE_CHOOSE_MUSIC 25
+#define SETUP_MODE_CHOOSE_VOLUME_SIMPLE 26
+#define SETUP_MODE_CHOOSE_VOLUME_LOOPS 27
+#define SETUP_MODE_CHOOSE_VOLUME_MUSIC 28
+#define SETUP_MODE_CHOOSE_TOUCH_CONTROL 29
+#define SETUP_MODE_CHOOSE_MOVE_DISTANCE 30
+#define SETUP_MODE_CHOOSE_DROP_DISTANCE 31
+#define SETUP_MODE_CHOOSE_TRANSPARENCY 32
+#define SETUP_MODE_CHOOSE_GRID_XSIZE_0 33
+#define SETUP_MODE_CHOOSE_GRID_YSIZE_0 34
+#define SETUP_MODE_CHOOSE_GRID_XSIZE_1 35
+#define SETUP_MODE_CHOOSE_GRID_YSIZE_1 36
+#define SETUP_MODE_CONFIG_VIRT_BUTTONS 37
+
+#define MAX_SETUP_MODES 38
#define MAX_MENU_MODES MAX(MAX_INFO_MODES, MAX_SETUP_MODES)
#define STR_SETUP_CHOOSE_WINDOW_SIZE "Window Scaling"
#define STR_SETUP_CHOOSE_SCALING_TYPE "Anti-Aliasing"
#define STR_SETUP_CHOOSE_RENDERING "Rendering Mode"
+#define STR_SETUP_CHOOSE_VSYNC "VSync Mode"
#define STR_SETUP_CHOOSE_VOLUME_SIMPLE "Sound Volume"
#define STR_SETUP_CHOOSE_VOLUME_LOOPS "Loops Volume"
#define STR_SETUP_CHOOSE_VOLUME_MUSIC "Music Volume"
#define STR_SETUP_CHOOSE_TOUCH_CONTROL "Control Type"
#define STR_SETUP_CHOOSE_MOVE_DISTANCE "Move Distance"
#define STR_SETUP_CHOOSE_DROP_DISTANCE "Drop Distance"
+#define STR_SETUP_CHOOSE_TRANSPARENCY "Transparency"
+#define STR_SETUP_CHOOSE_GRID_XSIZE_0 "Horiz. Buttons"
+#define STR_SETUP_CHOOSE_GRID_YSIZE_0 "Vert. Buttons"
+#define STR_SETUP_CHOOSE_GRID_XSIZE_1 "Horiz. Buttons"
+#define STR_SETUP_CHOOSE_GRID_YSIZE_1 "Vert. Buttons"
/* for input setup functions */
#define SETUPINPUT_SCREEN_POS_START 0
-#define SETUPINPUT_SCREEN_POS_END (SCR_FIELDY - 4)
-#define SETUPINPUT_SCREEN_POS_EMPTY1 (SETUPINPUT_SCREEN_POS_START + 3)
-#define SETUPINPUT_SCREEN_POS_EMPTY2 (SETUPINPUT_SCREEN_POS_END - 1)
+#define SETUPINPUT_SCREEN_POS_EMPTY1 3
+#define SETUPINPUT_SCREEN_POS_EMPTY2 12
+#define SETUPINPUT_SCREEN_POS_END 13
#define MENU_SETUP_FONT_TITLE FONT_TEXT_1
#define MENU_SETUP_FONT_TEXT FONT_TITLE_2
+#define MAX_SETUP_TEXT_INPUT_LEN 28
+
/* for various menu stuff */
#define MENU_SCREEN_START_XPOS 1
#define MENU_SCREEN_START_YPOS 2
#define MENU_INFO_FONT_TEXT FONT_TEXT_3
#define MENU_INFO_FONT_FOOT FONT_TEXT_4
#define MENU_INFO_SPACE_HEAD (menu.headline2_spacing_info[info_mode])
-#define MENU_SCREEN_INFO_XSTART 16
-#define MENU_SCREEN_INFO_YSTART1 100
+#define MENU_SCREEN_INFO_SPACE_LEFT (menu.left_spacing_info[info_mode])
+#define MENU_SCREEN_INFO_SPACE_RIGHT (menu.right_spacing_info[info_mode])
+#define MENU_SCREEN_INFO_SPACE_TOP (menu.top_spacing_info[info_mode])
+#define MENU_SCREEN_INFO_SPACE_BOTTOM (menu.bottom_spacing_info[info_mode])
+#define MENU_SCREEN_INFO_YSTART1 MENU_SCREEN_INFO_SPACE_TOP
#define MENU_SCREEN_INFO_YSTART2 (MENU_SCREEN_INFO_YSTART1 + \
getMenuTextStep(MENU_INFO_SPACE_HEAD, \
MENU_INFO_FONT_TITLE))
#define MENU_SCREEN_INFO_YSTEP (TILEY + 4)
-#define MENU_SCREEN_INFO_YBOTTOM (SYSIZE - 20)
+#define MENU_SCREEN_INFO_YBOTTOM (SYSIZE - MENU_SCREEN_INFO_SPACE_BOTTOM)
#define MENU_SCREEN_INFO_YSIZE (MENU_SCREEN_INFO_YBOTTOM - \
MENU_SCREEN_INFO_YSTART2 - \
TILEY / 2)
#define MAX_MENU_TEXT_LENGTH_BIG 13
#define MAX_MENU_TEXT_LENGTH_MEDIUM (MAX_MENU_TEXT_LENGTH_BIG * 2)
-/* buttons and scrollbars identifiers */
+/* screen gadget identifiers */
#define SCREEN_CTRL_ID_PREV_LEVEL 0
#define SCREEN_CTRL_ID_NEXT_LEVEL 1
#define SCREEN_CTRL_ID_PREV_PLAYER 2
#define SCREEN_CTRL_ID_NEXT_PLAYER 3
-#define SCREEN_CTRL_ID_SCROLL_UP 4
-#define SCREEN_CTRL_ID_SCROLL_DOWN 5
-#define SCREEN_CTRL_ID_SCROLL_VERTICAL 6
+#define SCREEN_CTRL_ID_INSERT_SOLUTION 4
+#define SCREEN_CTRL_ID_PLAY_SOLUTION 5
+#define SCREEN_CTRL_ID_SCROLL_UP 6
+#define SCREEN_CTRL_ID_SCROLL_DOWN 7
+#define SCREEN_CTRL_ID_SCROLL_VERTICAL 8
+#define SCREEN_CTRL_ID_NETWORK_SERVER 9
-#define NUM_SCREEN_GADGETS 7
+#define NUM_SCREEN_GADGETS 10
-#define NUM_SCREEN_MENUBUTTONS 4
+#define NUM_SCREEN_MENUBUTTONS 6
#define NUM_SCREEN_SCROLLBUTTONS 2
#define NUM_SCREEN_SCROLLBARS 1
+#define NUM_SCREEN_TEXTINPUT 1
#define SCREEN_MASK_MAIN (1 << 0)
-#define SCREEN_MASK_INPUT (1 << 1)
+#define SCREEN_MASK_MAIN_HAS_SOLUTION (1 << 1)
+#define SCREEN_MASK_INPUT (1 << 2)
/* graphic position and size values for buttons and scrollbars */
#define SC_MENUBUTTON_XSIZE TILEX
static void HandleSetupScreen_Input(int, int, int, int, int);
static void CustomizeKeyboard(int);
static void ConfigureJoystick(int);
+static void ConfigureVirtualButtons(void);
static void execSetupGame(void);
static void execSetupGraphics(void);
static void execSetupSound(void);
static void HandleInfoScreen_Program(int);
static void HandleInfoScreen_Version(int);
+static void ModifyGameSpeedIfNeeded(void);
+static void DisableVsyncIfNeeded(void);
+
static void MapScreenMenuGadgets(int);
static void MapScreenGadgets(int);
static void MapScreenTreeGadgets(TreeInfo *);
+static void UpdateScreenMenuGadgets(int, boolean);
+
static struct GadgetInfo *screen_gadget[NUM_SCREEN_GADGETS];
static int info_mode = INFO_MODE_MAIN;
static TreeInfo *rendering_modes = NULL;
static TreeInfo *rendering_mode_current = NULL;
+static TreeInfo *vsync_modes = NULL;
+static TreeInfo *vsync_mode_current = NULL;
+
static TreeInfo *scroll_delays = NULL;
static TreeInfo *scroll_delay_current = NULL;
static TreeInfo *snapshot_modes = NULL;
static TreeInfo *snapshot_mode_current = NULL;
+static TreeInfo *game_speeds_normal = NULL;
+static TreeInfo *game_speeds_extended = NULL;
static TreeInfo *game_speeds = NULL;
static TreeInfo *game_speed_current = NULL;
static TreeInfo *drop_distances = NULL;
static TreeInfo *drop_distance_current = NULL;
+static TreeInfo *transparencies = NULL;
+static TreeInfo *transparency_current = NULL;
+
+static TreeInfo *grid_sizes[2][2] = { { NULL, NULL }, { NULL, NULL } };
+static TreeInfo *grid_size_current[2][2] = { { NULL, NULL }, { NULL, NULL } };
+
static TreeInfo *level_number = NULL;
static TreeInfo *level_number_current = NULL;
-static struct
-{
- int value;
- char *text;
-} window_sizes_list[] =
+static struct ValueTextInfo window_sizes_list[] =
{
{ 50, "50 %" },
{ 80, "80 %" },
{ -1, NULL },
};
-static struct
-{
- char *value;
- char *text;
-} scaling_types_list[] =
+static struct StringValueTextInfo scaling_types_list[] =
{
- { SCALING_QUALITY_NEAREST, "None" },
+ { SCALING_QUALITY_NEAREST, "Off" },
{ SCALING_QUALITY_LINEAR, "Linear" },
{ SCALING_QUALITY_BEST, "Anisotropic" },
{ NULL, NULL },
};
-static struct
-{
- char *value;
- char *text;
-} rendering_modes_list[] =
+static struct StringValueTextInfo rendering_modes_list[] =
{
{ STR_SPECIAL_RENDERING_OFF, "Off (May show artifacts, fast)" },
{ STR_SPECIAL_RENDERING_BITMAP, "Bitmap/Texture mode (slower)" },
{ NULL, NULL },
};
-static struct
+static struct StringValueTextInfo vsync_modes_list[] =
{
- int value;
- char *text;
-} game_speeds_list[] =
+ { STR_VSYNC_MODE_OFF, "Off" },
+ { STR_VSYNC_MODE_NORMAL, "Normal" },
+ { STR_VSYNC_MODE_ADAPTIVE, "Adaptive" },
+
+ { NULL, NULL },
+};
+
+static struct ValueTextInfo game_speeds_list_normal[] =
{
-#if 1
{ 30, "Very Slow" },
{ 25, "Slow" },
{ 20, "Normal" },
{ 15, "Fast" },
{ 10, "Very Fast" },
-#else
- { 1000, "1/1s (Extremely Slow)" },
- { 500, "1/2s" },
- { 200, "1/5s" },
- { 100, "1/10s" },
- { 50, "1/20s" },
- { 29, "1/35s (Original Supaplex)" },
- { 25, "1/40s" },
- { 20, "1/50s (Normal Speed)" },
- { 14, "1/70s (Maximum Supaplex)" },
- { 10, "1/100s" },
- { 5, "1/200s" },
- { 2, "1/500s" },
- { 1, "1/1000s (Extremely Fast)" },
-#endif
{ -1, NULL },
};
-static struct
-{
- int value;
- char *text;
-} scroll_delays_list[] =
+static struct ValueTextInfo game_speeds_list_extended[] =
+{
+ { 1000, "1 fps (Extremely Slow)" },
+ { 500, "2 fps" },
+ { 200, "5 fps" },
+ { 100, "10 fps" },
+ { 50, "20 fps" },
+ { 29, "35 fps (Original Supaplex)" },
+ { 25, "40 fps" },
+ { 20, "50 fps (=== Normal Speed ===)" },
+ { 16, "60 fps (60 Hz VSync Speed)" },
+ { 14, "70 fps (Maximum Supaplex)" },
+ { 10, "100 fps" },
+ { 5, "200 fps" },
+ { 2, "500 fps" },
+ { 1, "1000 fps (Extremely Fast)" },
+
+ { -1, NULL },
+};
+
+static struct ValueTextInfo *game_speeds_list;
+
+static struct ValueTextInfo scroll_delays_list[] =
{
{ 0, "0 Tiles (No Scroll Delay)" },
{ 1, "1 Tile" },
{ -1, NULL },
};
-static struct
-{
- char *value;
- char *text;
-} snapshot_modes_list[] =
+static struct StringValueTextInfo snapshot_modes_list[] =
{
{ STR_SNAPSHOT_MODE_OFF, "Off" },
{ STR_SNAPSHOT_MODE_EVERY_STEP, "Every Step" },
{ NULL, NULL },
};
-static struct
-{
- int value;
- char *text;
-} volumes_list[] =
+static struct ValueTextInfo volumes_list[] =
{
{ 0, "0 %" },
{ 1, "1 %" },
{ -1, NULL },
};
-static struct
-{
- char *value;
- char *text;
-} touch_controls_list[] =
+static struct StringValueTextInfo touch_controls_list[] =
{
+ { TOUCH_CONTROL_OFF, "Off" },
{ TOUCH_CONTROL_VIRTUAL_BUTTONS, "Virtual Buttons" },
{ TOUCH_CONTROL_WIPE_GESTURES, "Wipe Gestures" },
{ TOUCH_CONTROL_FOLLOW_FINGER, "Follow Finger" },
{ NULL, NULL },
};
-static struct
-{
- int value;
- char *text;
-} distances_list[] =
+static struct ValueTextInfo distances_list[] =
{
{ 1, "1 %" },
{ 2, "2 %" },
{ -1, NULL },
};
+static struct ValueTextInfo transparencies_list[] =
+{
+ { 0, "0 % (Opaque)" },
+ { 10, "10 %" },
+ { 20, "20 %" },
+ { 30, "30 %" },
+ { 40, "40 %" },
+ { 50, "50 %" },
+ { 60, "60 %" },
+ { 70, "70 %" },
+ { 80, "80 %" },
+ { 90, "90 %" },
+ { 100, "100 % (Invisible)" },
+
+ { -1, NULL },
+};
+
+static struct ValueTextInfo grid_sizes_list[] =
+{
+ { 3, "3" },
+ { 4, "4" },
+ { 5, "5" },
+ { 6, "6" },
+ { 7, "7" },
+ { 8, "8" },
+ { 9, "9" },
+ { 10, "10" },
+ { 11, "11" },
+ { 12, "12" },
+ { 13, "13" },
+ { 14, "14" },
+ { 15, "15" },
+ { 16, "16" },
+ { 17, "17" },
+ { 18, "18" },
+ { 19, "19" },
+ { 20, "20" },
+ { 21, "21" },
+ { 22, "22" },
+ { 23, "23" },
+ { 24, "24" },
+ { 25, "25" },
+ { 26, "26" },
+ { 27, "27" },
+ { 28, "28" },
+ { 29, "29" },
+ { 30, "30" },
+ { 31, "31" },
+ { 32, "32" },
+
+ { -1, NULL },
+};
+
#define DRAW_MODE(s) ((s) >= GAME_MODE_MAIN && \
(s) <= GAME_MODE_SETUP ? (s) : \
(s) == GAME_MODE_PSEUDO_TYPENAME ? \
static char str_main_text_last_level[10];
static char str_main_text_level_number[10];
+static char network_server_hostname[MAX_SETUP_TEXT_INPUT_LEN + 1];
+
static char *main_text_name = str_main_text_name;
static char *main_text_first_level = str_main_text_first_level;
static char *main_text_last_level = str_main_text_last_level;
#endif
{
MAIN_CONTROL_FIRST_LEVEL,
- NULL, -1,
+ &menu.main.button.first_level, IMG_MENU_BUTTON_FIRST_LEVEL,
&menu.main.text.first_level, &main_text_first_level,
NULL, NULL,
},
{
MAIN_CONTROL_LAST_LEVEL,
- NULL, -1,
+ &menu.main.button.last_level, IMG_MENU_BUTTON_LAST_LEVEL,
&menu.main.text.last_level, &main_text_last_level,
NULL, NULL,
},
{
MAIN_CONTROL_LEVEL_NUMBER,
- NULL, -1,
+ &menu.main.button.level_number, IMG_MENU_BUTTON_LEVEL_NUMBER,
&menu.main.text.level_number, &main_text_level_number,
NULL, NULL,
},
return (pos != NULL && pos->x != -1 && pos->y != -1);
}
-static void InitializeMainControls()
+static void InitializeMainControls(void)
{
- TreeInfo *graphics_current =
- getArtworkTreeInfoForUserLevelSet(ARTWORK_TYPE_GRAPHICS);
- boolean local_team_mode = (!options.network && setup.team_mode);
+ boolean local_team_mode = (!network.enabled && setup.team_mode);
int i;
/* set main control text values to dynamically determined values */
main_text_level_imported_by = leveldir_current->imported_by;
main_text_level_tested_by = leveldir_current->tested_by;
- main_text_title_1 = (leveldir_current->program_title ?
- leveldir_current->program_title :
- graphics_current->program_title ?
- graphics_current->program_title :
- setup.internal.program_title);
- main_text_title_2 = (leveldir_current->program_copyright ?
- leveldir_current->program_copyright :
- graphics_current->program_copyright ?
- graphics_current->program_copyright :
- setup.internal.program_copyright);
- main_text_title_3 = (leveldir_current->program_company ?
- leveldir_current->program_company :
- graphics_current->program_company ?
- graphics_current->program_company :
- setup.internal.program_company);
+ main_text_title_1 = getConfigProgramTitleString();
+ main_text_title_2 = getConfigProgramCopyrightString();
+ main_text_title_3 = getConfigProgramCompanyString();
/* set main control screen positions to dynamically determined values */
for (i = 0; main_controls[i].nr != -1; i++)
if (pos_text != NULL) /* (x/y may be -1/-1 here) */
{
- /* calculate size for non-clickable text -- needed for text alignment */
- boolean calculate_text_size = (pos_button == NULL && text != NULL);
+ /* calculate text size -- needed for text alignment */
+ boolean calculate_text_size = (text != NULL);
if (pos_text->width == -1 || calculate_text_size)
pos_text->width = text_width;
first_entry);
}
-static void clearMenuListArea()
+static void clearMenuListArea(void)
{
int scrollbar_xpos = mSX + SC_SCROLLBAR_XPOS + menu.scrollbar_xoffset;
drawCursorExt(0, ypos, active, -1);
}
-void DrawHeadline()
+static void DrawHeadline(void)
{
- DrawTextSCentered(MENU_TITLE1_YPOS, FONT_TITLE_1, getProgramTitleString());
- DrawTextSCentered(MENU_TITLE2_YPOS, FONT_TITLE_2,
- setup.internal.program_copyright);
+ DrawTextSCentered(MENU_TITLE1_YPOS, FONT_TITLE_1, main_text_title_1);
+ DrawTextSCentered(MENU_TITLE2_YPOS, FONT_TITLE_2, main_text_title_2);
}
-void DrawTitleScreenImage(int nr, boolean initial)
+static void DrawTitleScreenImage(int nr, boolean initial)
{
int graphic = getTitleScreenGraphic(nr, initial);
Bitmap *bitmap = graphic_info[graphic].bitmap;
redraw_mask = REDRAW_ALL;
}
-void DrawTitleScreenMessage(int nr, boolean initial)
+static void DrawTitleScreenMessage(int nr, boolean initial)
{
char *filename = getLevelSetTitleMessageFilename(nr, initial);
struct TitleMessageInfo *tmi = getTitleMessageInfo(nr, initial);
ResetFontStatus();
}
-void DrawTitleScreen()
+static void DrawTitleScreen(void)
{
KeyboardAutoRepeatOff();
HandleTitleScreen(0, 0, 0, 0, MB_MENU_INITIALIZE);
}
-boolean CheckTitleScreen(boolean levelset_has_changed)
+static boolean CheckTitleScreen(boolean levelset_has_changed)
{
static boolean show_title_initial = TRUE;
boolean show_titlescreen = FALSE;
return (show_titlescreen && num_title_screens > 0);
}
-void DrawMainMenu()
+void DrawMainMenu(void)
{
static LevelDirTree *leveldir_last_valid = NULL;
boolean levelset_has_changed = FALSE;
DrawCursorAndText_Main(-1, FALSE, FALSE);
DrawPreviewLevelInitial();
+ DrawNetworkPlayers();
HandleMainMenu(0, 0, 0, 0, MB_MENU_INITIALIZE);
FreeScreenGadgets();
CreateScreenGadgets();
+ /* may be required if audio buttons shown on tape and changed in setup menu */
+ FreeGameButtons();
+ CreateGameButtons();
+
/* map gadgets for main menu screen */
MapTapeButtons();
MapScreenMenuGadgets(SCREEN_MASK_MAIN);
+ UpdateScreenMenuGadgets(SCREEN_MASK_MAIN_HAS_SOLUTION, hasSolutionTape());
/* copy actual game door content to door double buffer for OpenDoor() */
BlitBitmap(drawto, bitmap_db_door_1, DX, DY, DXSIZE, DYSIZE, 0, 0);
OpenDoor(DOOR_CLOSE_1 | DOOR_OPEN_2);
}
-static void gotoTopLevelDir()
+static void gotoTopLevelDir(void)
{
/* move upwards until inside (but not above) top level directory */
while (leveldir_current->node_parent &&
}
}
-void HandleMainMenu_SelectLevel(int step, int direction, int selected_level_nr)
+static void HandleMainMenu_SelectLevel(int step, int direction,
+ int selected_level_nr)
{
int old_level_nr = level_nr;
int new_level_nr;
SaveLevelSetup_SeriesInfo();
+ UpdateScreenMenuGadgets(SCREEN_MASK_MAIN_HAS_SOLUTION, hasSolutionTape());
+
/* needed because DrawPreviewLevelInitial() takes some time */
BackToFront();
/* SyncDisplay(); */
SetGameStatus(GAME_MODE_SCORES);
- DrawHallOfFame(-1);
+ DrawHallOfFame(level_nr, -1);
}
else if (pos == MAIN_CONTROL_EDITOR)
{
}
else if (pos == MAIN_CONTROL_GAME)
{
- StartGameActions(options.network, setup.autorecord, level.random_seed);
+ StartGameActions(network.enabled, setup.autorecord, level.random_seed);
}
else if (pos == MAIN_CONTROL_SETUP)
{
static int num_info_info; /* number of info entries shown on screen */
static int max_info_info; /* total number of info entries in list */
-static void execInfoTitleScreen()
+static void execInfoTitleScreen(void)
{
info_mode = INFO_MODE_TITLE;
DrawInfoScreen();
}
-static void execInfoElements()
+static void execInfoElements(void)
{
info_mode = INFO_MODE_ELEMENTS;
DrawInfoScreen();
}
-static void execInfoMusic()
+static void execInfoMusic(void)
{
info_mode = INFO_MODE_MUSIC;
DrawInfoScreen();
}
-static void execInfoCredits()
+static void execInfoCredits(void)
{
info_mode = INFO_MODE_CREDITS;
DrawInfoScreen();
}
-static void execInfoProgram()
+static void execInfoProgram(void)
{
info_mode = INFO_MODE_PROGRAM;
DrawInfoScreen();
}
-static void execInfoVersion()
+static void execInfoVersion(void)
{
info_mode = INFO_MODE_VERSION;
DrawInfoScreen();
}
-static void execInfoLevelSet()
+static void execInfoLevelSet(void)
{
info_mode = INFO_MODE_LEVELSET;
DrawInfoScreen();
}
-static void execExitInfo()
+static void execExitInfo(void)
{
SetGameStatus(GAME_MODE_MAIN);
TYPE_YES_NO |
TYPE_YES_NO_AUTO |
TYPE_STRING |
+ TYPE_PLAYER |
TYPE_ECS_AGA |
TYPE_KEYTEXT |
- TYPE_ENTER_LIST))
+ TYPE_ENTER_LIST |
+ TYPE_TEXT_INPUT))
return FONT_MENU_2;
else
return FONT_MENU_1;
int ypos = MENU_SCREEN_START_YPOS + screen_pos;
int font_nr = getMenuTextFont(ti->type);
- if (token_info == setup_info_input)
+ if (setup_mode == SETUP_MODE_INPUT)
font_nr = FONT_MENU_1;
if (active)
static char *window_size_text;
static char *scaling_type_text;
+static char *network_server_text;
static void drawSetupValue(int, int);
DrawCursorAndText_Menu(i, menu_info_pos, FALSE);
+ if (si->type & TYPE_STRING)
+ {
+ int gadget_id = -1;
+
+ if (value_ptr == &network_server_text)
+ gadget_id = SCREEN_CTRL_ID_NETWORK_SERVER;
+
+ if (gadget_id != -1)
+ {
+ struct GadgetInfo *gi = screen_gadget[gadget_id];
+ int xpos = MENU_SCREEN_START_XPOS;
+ int ypos = MENU_SCREEN_START_YPOS + i;
+ int x = mSX + xpos * 32;
+ int y = mSY + ypos * 32;
+
+ ModifyGadget(gi, GDI_X, x, GDI_Y, y, GDI_END);
+ }
+ }
+
if (si->type & TYPE_VALUE &&
menu_info == setup_info)
drawSetupValue(i, menu_info_pos);
}
}
-static void DrawInfoScreen_Main()
+static void DrawInfoScreen_Main(void)
{
int fade_mask = REDRAW_FIELD;
int i;
static void changeSetupValue(int, int, int);
-void HandleMenuScreen(int mx, int my, int dx, int dy, int button,
- int mode, int num_page_entries, int max_page_entries)
+static void HandleMenuScreen(int mx, int my, int dx, int dy, int button,
+ int mode, int num_page_entries,
+ int max_page_entries)
{
static int num_page_entries_all_last[NUM_SPECIAL_GFX_ARGS][MAX_MENU_MODES];
static int choice_stores[NUM_SPECIAL_GFX_ARGS][MAX_MENU_MODES];
if (menu_info[choice].type & menu_navigation_type ||
menu_info[choice].type & TYPE_BOOLEAN_STYLE ||
- menu_info[choice].type & TYPE_YES_NO_AUTO)
+ menu_info[choice].type & TYPE_YES_NO_AUTO ||
+ menu_info[choice].type & TYPE_PLAYER)
button = MB_MENU_CHOICE;
}
else if (dy)
menu_info[first_entry + y - 1].type & TYPE_ENTER_LIST)
y--;
+ /* when selecting string value, execute function for text input gadget */
+ if (menu_info[first_entry + y].type & TYPE_STRING && y > 0 &&
+ menu_info[first_entry + y - 1].type & TYPE_TEXT_INPUT)
+ y--;
+
if (menu_info[first_entry + y].type & TYPE_ENTER_OR_LEAVE)
{
void (*menu_callback_function)(void) =
menu_callback_function();
}
+ else if (menu_info[first_entry + y].type & TYPE_TEXT_INPUT)
+ {
+ void (*gadget_callback_function)(void) =
+ menu_info[first_entry + y].value;
+
+ gadget_callback_function();
+ }
else if (menu_info[first_entry + y].type & TYPE_VALUE &&
menu_info == setup_info)
{
int font_foot = MENU_INFO_FONT_FOOT;
int spacing_title = menu.headline1_spacing_info[info_mode];
int ystep_title = getMenuTextStep(spacing_title, font_title);
- int ystart1 = mSY - SY + 100;
+ int ystart1 = mSY - SY + MENU_SCREEN_INFO_YSTART1;
int ystart2 = ystart1 + ystep_title;
- int ybottom = mSY - SY + SYSIZE - 20;
+ int ybottom = mSY - SY + MENU_SCREEN_INFO_YBOTTOM;
SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO);
static int infoscreen_frame[MAX_INFO_ELEMENTS_ON_SCREEN];
int font_title = MENU_INFO_FONT_TITLE;
int font_foot = MENU_INFO_FONT_FOOT;
- int xstart = mSX + MENU_SCREEN_INFO_XSTART;
+ int xstart = mSX + MENU_SCREEN_INFO_SPACE_LEFT;
int ystart1 = mSY - SY + MENU_SCREEN_INFO_YSTART1;
int ystart2 = mSY + MENU_SCREEN_INFO_YSTART2;
int ybottom = mSY - SY + MENU_SCREEN_INFO_YBOTTOM;
int font_width = getFontWidth(font_nr);
int font_height = getFontHeight(font_nr);
int yoffset = (TILEX - 2 * font_height) / 2;
- int xstart = mSX + MINI_TILEX + TILEX + MINI_TILEX;
+ int xstart = mSX + MENU_SCREEN_INFO_SPACE_LEFT + TILEX + MINI_TILEX;
int ystart = mSY + MENU_SCREEN_INFO_YSTART2 + yoffset;
int ystep = TILEY + 4;
- int pad_x = xstart - SX;
- int max_chars_per_line = (SXSIZE - pad_x - MINI_TILEX) / font_width;
+ int pad_left = xstart - SX;
+ int pad_right = MENU_SCREEN_INFO_SPACE_RIGHT;
+ int max_chars_per_line = (SXSIZE - pad_left - pad_right) / font_width;
int max_lines_per_text = 2;
char *text = NULL;
TRUE, FALSE, FALSE);
}
-void DrawInfoScreen_TitleScreen()
+static void DrawInfoScreen_TitleScreen(void)
{
SetGameStatus(GAME_MODE_TITLE);
HandleTitleScreen(0, 0, 0, 0, button);
}
-void DrawInfoScreen_Elements()
+static void DrawInfoScreen_Elements(void)
{
SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_ELEMENTS);
}
}
-void DrawInfoScreen_Music()
+static void DrawInfoScreen_Music(void)
{
SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_MUSIC);
int spacing_head = menu.headline2_spacing_info[info_mode];
int ystep_title = getMenuTextStep(spacing_title, font_title);
int ystep_head = getMenuTextStep(spacing_head, font_head);
- int ystart = mSY - SY + 100;
- int ybottom = mSY - SY + SYSIZE - 20;
+ int ystart = mSY - SY + MENU_SCREEN_INFO_YSTART1;
+ int ybottom = mSY - SY + MENU_SCREEN_INFO_YBOTTOM;
if (button == MB_MENU_INITIALIZE)
{
}
else
{
- PlayMusic(list->music);
+ int music = list->music;
+
+ if (music_info[music].loop)
+ PlayMusicLoop(music);
+ else
+ PlayMusic(music);
DrawTextSCentered(ystart, font_title, "The Game Background Music:");
}
int ystep_head = getMenuTextStep(spacing_head, font_head);
int ystep_para = getMenuTextStep(spacing_para, font_text);
int ystep_line = getMenuTextStep(spacing_line, font_text);
- int ystart = mSY - SY + 100;
- int ybottom = mSY - SY + SYSIZE - 20;
+ int ystart = mSY - SY + MENU_SCREEN_INFO_YSTART1;
+ int ybottom = mSY - SY + MENU_SCREEN_INFO_YBOTTOM;
ClearField();
DrawHeadline();
"Press any key or button for next page");
}
-void DrawInfoScreen_Credits()
+static void DrawInfoScreen_Credits(void)
{
SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_CREDITS);
}
}
-void DrawInfoScreen_Program()
+static void DrawInfoScreen_Program(void)
{
int font_title = MENU_INFO_FONT_TITLE;
int font_head = MENU_INFO_FONT_HEAD;
int ystep_head = getMenuTextStep(spacing_head, font_head);
int ystep_para = getMenuTextStep(spacing_para, font_text);
int ystep_line = getMenuTextStep(spacing_line, font_text);
- int ystart = mSY - SY + 100;
- int ybottom = mSY - SY + SYSIZE - 20;
+ int ystart = mSY - SY + MENU_SCREEN_INFO_YSTART1;
+ int ybottom = mSY - SY + MENU_SCREEN_INFO_YBOTTOM;
SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_PROGRAM);
}
}
-void DrawInfoScreen_Version()
+static void DrawInfoScreen_Version(void)
{
int font_title = MENU_INFO_FONT_TITLE;
int font_head = MENU_INFO_FONT_HEAD;
int ystep_head = getMenuTextStep(spacing_head, font_head);
int ystep_para = getMenuTextStep(spacing_para, font_text);
int ystep_line = getMenuTextStep(spacing_line, font_text);
- int ystart = mSY - SY + 100;
- int ybottom = mSY - SY + SYSIZE - 20;
+ int ystart = mSY - SY + MENU_SCREEN_INFO_YSTART1;
+ int ybottom = mSY - SY + MENU_SCREEN_INFO_YBOTTOM;
int xstart1 = mSX - SX + 2 * xstep;
int xstart2 = mSX - SX + 18 * xstep;
int xstart3 = mSX - SX + 28 * xstep;
}
}
-void DrawInfoScreen_LevelSet()
+static void DrawInfoScreen_LevelSet(void)
{
struct TitleMessageInfo *tmi = &readme;
char *filename = getLevelSetInfoFilename();
char *title = "Level Set Information:";
- int ystart = mSY - SY + 100;
- int ybottom = mSY - SY + SYSIZE - 20;
+ int ystart = mSY - SY + MENU_SCREEN_INFO_YSTART1;
+ int ybottom = mSY - SY + MENU_SCREEN_INFO_YBOTTOM;
if (filename == NULL)
{
/* if height set to "-1", automatically determine by playfield height */
if (tmi->height == -1)
- tmi->height = SYSIZE - 20 - tmi->y - 10;
+ tmi->height = MENU_SCREEN_INFO_YBOTTOM - tmi->y - 10;
/* if chars set to "-1", automatically determine by text and font width */
if (tmi->chars == -1)
FadeIn(REDRAW_FIELD);
}
-void HandleInfoScreen_LevelSet(int button)
+static void HandleInfoScreen_LevelSet(int button)
{
if (button == MB_MENU_LEAVE)
{
}
}
-static void DrawInfoScreen()
+static void DrawInfoScreen(void)
{
if (info_mode == INFO_MODE_TITLE)
DrawInfoScreen_TitleScreen();
execSetupGame();
else if (setup_mode == SETUP_MODE_CHOOSE_WINDOW_SIZE ||
setup_mode == SETUP_MODE_CHOOSE_SCALING_TYPE ||
- setup_mode == SETUP_MODE_CHOOSE_RENDERING)
+ setup_mode == SETUP_MODE_CHOOSE_RENDERING ||
+ setup_mode == SETUP_MODE_CHOOSE_VSYNC)
execSetupGraphics();
else if (setup_mode == SETUP_MODE_CHOOSE_VOLUME_SIMPLE ||
setup_mode == SETUP_MODE_CHOOSE_VOLUME_LOOPS ||
execSetupSound();
else if (setup_mode == SETUP_MODE_CHOOSE_TOUCH_CONTROL ||
setup_mode == SETUP_MODE_CHOOSE_MOVE_DISTANCE ||
- setup_mode == SETUP_MODE_CHOOSE_DROP_DISTANCE)
+ setup_mode == SETUP_MODE_CHOOSE_DROP_DISTANCE ||
+ setup_mode == SETUP_MODE_CHOOSE_TRANSPARENCY ||
+ setup_mode == SETUP_MODE_CHOOSE_GRID_XSIZE_0 ||
+ setup_mode == SETUP_MODE_CHOOSE_GRID_YSIZE_0 ||
+ setup_mode == SETUP_MODE_CHOOSE_GRID_XSIZE_1 ||
+ setup_mode == SETUP_MODE_CHOOSE_GRID_YSIZE_1)
execSetupTouch();
else
execSetupArtwork();
execSetupGame();
else if (setup_mode == SETUP_MODE_CHOOSE_WINDOW_SIZE ||
setup_mode == SETUP_MODE_CHOOSE_SCALING_TYPE ||
- setup_mode == SETUP_MODE_CHOOSE_RENDERING)
+ setup_mode == SETUP_MODE_CHOOSE_RENDERING ||
+ setup_mode == SETUP_MODE_CHOOSE_VSYNC)
execSetupGraphics();
else if (setup_mode == SETUP_MODE_CHOOSE_VOLUME_SIMPLE ||
setup_mode == SETUP_MODE_CHOOSE_VOLUME_LOOPS ||
execSetupSound();
else if (setup_mode == SETUP_MODE_CHOOSE_TOUCH_CONTROL ||
setup_mode == SETUP_MODE_CHOOSE_MOVE_DISTANCE ||
- setup_mode == SETUP_MODE_CHOOSE_DROP_DISTANCE)
+ setup_mode == SETUP_MODE_CHOOSE_DROP_DISTANCE ||
+ setup_mode == SETUP_MODE_CHOOSE_TRANSPARENCY ||
+ setup_mode == SETUP_MODE_CHOOSE_GRID_XSIZE_0 ||
+ setup_mode == SETUP_MODE_CHOOSE_GRID_YSIZE_0 ||
+ setup_mode == SETUP_MODE_CHOOSE_GRID_XSIZE_1 ||
+ setup_mode == SETUP_MODE_CHOOSE_GRID_YSIZE_1)
execSetupTouch();
else
execSetupArtwork();
execSetupGame();
else if (setup_mode == SETUP_MODE_CHOOSE_WINDOW_SIZE ||
setup_mode == SETUP_MODE_CHOOSE_SCALING_TYPE ||
- setup_mode == SETUP_MODE_CHOOSE_RENDERING)
+ setup_mode == SETUP_MODE_CHOOSE_RENDERING ||
+ setup_mode == SETUP_MODE_CHOOSE_VSYNC)
execSetupGraphics();
else if (setup_mode == SETUP_MODE_CHOOSE_VOLUME_SIMPLE ||
setup_mode == SETUP_MODE_CHOOSE_VOLUME_LOOPS ||
execSetupSound();
else if (setup_mode == SETUP_MODE_CHOOSE_TOUCH_CONTROL ||
setup_mode == SETUP_MODE_CHOOSE_MOVE_DISTANCE ||
- setup_mode == SETUP_MODE_CHOOSE_DROP_DISTANCE)
+ setup_mode == SETUP_MODE_CHOOSE_DROP_DISTANCE ||
+ setup_mode == SETUP_MODE_CHOOSE_TRANSPARENCY ||
+ setup_mode == SETUP_MODE_CHOOSE_GRID_XSIZE_0 ||
+ setup_mode == SETUP_MODE_CHOOSE_GRID_YSIZE_0 ||
+ setup_mode == SETUP_MODE_CHOOSE_GRID_XSIZE_1 ||
+ setup_mode == SETUP_MODE_CHOOSE_GRID_YSIZE_1)
execSetupTouch();
else
execSetupArtwork();
}
}
-void DrawChooseLevelSet()
+void DrawChooseLevelSet(void)
{
FadeMenuSoundsAndMusic();
HandleChooseTree(mx, my, dx, dy, button, &leveldir_current);
}
-void DrawChooseLevelNr()
+void DrawChooseLevelNr(void)
{
int i;
HandleChooseTree(mx, my, dx, dy, button, &level_number_current);
}
-void DrawHallOfFame(int highlight_position)
+void DrawHallOfFame(int level_nr, int highlight_position)
{
int fade_mask = REDRAW_FIELD;
OpenDoor(GetDoorState() | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
- HandleHallOfFame(highlight_position, 0, 0, 0, MB_MENU_INITIALIZE);
+ HandleHallOfFame(level_nr, highlight_position, 0, 0, MB_MENU_INITIALIZE);
DrawMaskedBorder(fade_mask);
FadeIn(fade_mask);
}
-static void drawHallOfFameList(int first_entry, int highlight_position)
+static void drawHallOfFameList(int level_nr, int first_entry,
+ int highlight_position)
{
int i, j;
void HandleHallOfFame(int mx, int my, int dx, int dy, int button)
{
+ static int level_nr = 0;
static int first_entry = 0;
static int highlight_position = 0;
int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
if (button == MB_MENU_INITIALIZE)
{
+ level_nr = mx;
first_entry = 0;
- highlight_position = mx;
- drawHallOfFameList(first_entry, highlight_position);
+ highlight_position = my;
+
+ drawHallOfFameList(level_nr, first_entry, highlight_position);
return;
}
if (first_entry < 0)
first_entry = 0;
- drawHallOfFameList(first_entry, highlight_position);
+ drawHallOfFameList(level_nr, first_entry, highlight_position);
}
}
else if (dy > 0)
if (first_entry + NUM_MENU_ENTRIES_ON_SCREEN > MAX_SCORE_ENTRIES)
first_entry = MAX(0, MAX_SCORE_ENTRIES - NUM_MENU_ENTRIES_ON_SCREEN);
- drawHallOfFameList(first_entry, highlight_position);
+ drawHallOfFameList(level_nr, first_entry, highlight_position);
}
}
- else if (button == MB_MENU_LEAVE)
- {
- PlaySound(SND_MENU_ITEM_SELECTING);
-
- FadeSound(SND_BACKGROUND_SCORES);
-
- SetGameStatus(GAME_MODE_MAIN);
-
- DrawMainMenu();
- }
- else if (button == MB_MENU_CHOICE)
+ else if (button == MB_MENU_LEAVE || button == MB_MENU_CHOICE)
{
PlaySound(SND_MENU_ITEM_SELECTING);
FadeSound(SND_BACKGROUND_SCORES);
- SetGameStatus(GAME_MODE_MAIN);
+ if (game_status_last_screen == GAME_MODE_PLAYING &&
+ setup.auto_play_next_level && setup.increment_levels &&
+ level_nr < leveldir_current->last_level &&
+ !network_playing)
+ {
+ StartGameActions(network.enabled, setup.autorecord, level.random_seed);
+ }
+ else
+ {
+ SetGameStatus(GAME_MODE_MAIN);
- DrawMainMenu();
+ DrawMainMenu();
+ }
}
if (game_status == GAME_MODE_SCORES)
static char *window_size_text;
static char *scaling_type_text;
static char *rendering_mode_text;
+static char *vsync_mode_text;
static char *scroll_delay_text;
static char *snapshot_mode_text;
static char *game_speed_text;
+static char *network_server_text;
static char *graphics_set_name;
static char *sounds_set_name;
static char *music_set_name;
static char *touch_controls_text;
static char *move_distance_text;
static char *drop_distance_text;
+static char *transparency_text;
+static char *grid_size_text[2][2];
-static void execSetupMain()
+static void execSetupMain(void)
{
setup_mode = SETUP_MODE_MAIN;
DrawSetupScreen();
}
-static void execSetupGame_setGameSpeeds()
+static void execSetupGame_setGameSpeeds(boolean update_value)
{
+ if (setup.game_speed_extended)
+ {
+ game_speeds_list = game_speeds_list_extended;
+ game_speeds = game_speeds_extended;
+ }
+ else
+ {
+ game_speeds_list = game_speeds_list_normal;
+ game_speeds = game_speeds_normal;
+ }
+
if (game_speeds == NULL)
{
int i;
/* sort game speed values to start with slowest game speed */
sortTreeInfo(&game_speeds);
+ update_value = TRUE;
+ }
+
+ if (update_value)
+ {
/* set current game speed to configured game speed value */
game_speed_current =
getTreeInfoFromIdentifier(game_speeds, i_to_a(setup.game_frame_delay));
/* if that also fails, set current game speed to first available speed */
if (game_speed_current == NULL)
game_speed_current = game_speeds;
+
+ if (setup.game_speed_extended)
+ game_speeds_extended = game_speeds;
+ else
+ game_speeds_normal = game_speeds;
}
setup.game_frame_delay = atoi(game_speed_current->identifier);
game_speed_text = game_speed_current->name;
}
-static void execSetupGame_setScrollDelays()
+static void execSetupGame_setScrollDelays(void)
{
if (scroll_delays == NULL)
{
scroll_delay_text = scroll_delay_current->name;
}
-static void execSetupGame_setSnapshotModes()
+static void execSetupGame_setSnapshotModes(void)
{
if (snapshot_modes == NULL)
{
snapshot_mode_text = snapshot_mode_current->name;
}
-static void execSetupGame()
+static void execSetupGame_setNetworkServerText(void)
+{
+ if (strEqual(setup.network_server_hostname, STR_NETWORK_AUTO_DETECT))
+ {
+ strcpy(network_server_hostname, STR_NETWORK_AUTO_DETECT_SETUP);
+ }
+ else
+ {
+ strncpy(network_server_hostname, setup.network_server_hostname,
+ MAX_SETUP_TEXT_INPUT_LEN);
+ network_server_hostname[MAX_SETUP_TEXT_INPUT_LEN] = '\0';
+ }
+
+ /* needed for displaying network server text instead of identifier */
+ network_server_text = network_server_hostname;
+}
+
+static void execSetupGame(void)
{
- execSetupGame_setGameSpeeds();
+ boolean check_vsync_mode = (setup_mode == SETUP_MODE_CHOOSE_GAME_SPEED);
+
+ execSetupGame_setGameSpeeds(FALSE);
execSetupGame_setScrollDelays();
execSetupGame_setSnapshotModes();
+ execSetupGame_setNetworkServerText();
+
setup_mode = SETUP_MODE_GAME;
DrawSetupScreen();
+
+ // check if vsync needs to be disabled for this game speed to work
+ if (check_vsync_mode)
+ DisableVsyncIfNeeded();
}
-static void execSetupChooseGameSpeed()
+static void execSetupChooseGameSpeed(void)
{
setup_mode = SETUP_MODE_CHOOSE_GAME_SPEED;
DrawSetupScreen();
}
-static void execSetupChooseScrollDelay()
+static void execSetupChooseScrollDelay(void)
{
setup_mode = SETUP_MODE_CHOOSE_SCROLL_DELAY;
DrawSetupScreen();
}
-static void execSetupChooseSnapshotMode()
+static void execSetupChooseSnapshotMode(void)
{
setup_mode = SETUP_MODE_CHOOSE_SNAPSHOT_MODE;
DrawSetupScreen();
}
-static void execSetupEditor()
+static void execSetupEditor(void)
{
setup_mode = SETUP_MODE_EDITOR;
window_size_text = window_size_current->name;
}
-static void execSetupGraphics_setScalingTypes()
+static void execSetupGraphics_setScalingTypes(void)
{
if (scaling_types == NULL)
{
scaling_type_text = scaling_type_current->name;
}
-static void execSetupGraphics_setRenderingModes()
+static void execSetupGraphics_setRenderingModes(void)
{
if (rendering_modes == NULL)
{
rendering_mode_text = rendering_mode_current->name;
}
-static void execSetupGraphics()
+static void execSetupGraphics_setVsyncModes(boolean update_value)
+{
+ if (vsync_modes == NULL)
+ {
+ int i;
+
+ for (i = 0; vsync_modes_list[i].value != NULL; i++)
+ {
+ TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED);
+ char identifier[32], name[32];
+ char *value = vsync_modes_list[i].value;
+ char *text = vsync_modes_list[i].text;
+
+ ti->node_top = &vsync_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, STR_SETUP_CHOOSE_VSYNC);
+
+ pushTreeInfo(&vsync_modes, ti);
+ }
+
+ /* sort vsync mode values to start with lowest vsync mode value */
+ sortTreeInfo(&vsync_modes);
+
+ update_value = TRUE;
+ }
+
+ if (update_value)
+ {
+ /* set current vsync mode value to configured vsync mode value */
+ vsync_mode_current =
+ getTreeInfoFromIdentifier(vsync_modes, setup.vsync_mode);
+
+ /* if that fails, set current vsync mode to reliable default value */
+ if (vsync_mode_current == NULL)
+ vsync_mode_current =
+ getTreeInfoFromIdentifier(vsync_modes, STR_VSYNC_MODE_DEFAULT);
+
+ /* if that also fails, set current vsync mode to first available one */
+ if (vsync_mode_current == NULL)
+ vsync_mode_current = vsync_modes;
+ }
+
+ setup.vsync_mode = vsync_mode_current->identifier;
+
+ /* needed for displaying vsync mode text instead of identifier */
+ vsync_mode_text = vsync_mode_current->name;
+}
+
+static void execSetupGraphics(void)
{
+ boolean check_game_speed = (setup_mode == SETUP_MODE_CHOOSE_VSYNC);
+
// update "setup.window_scaling_percent" from list selection
// (in this case, window scaling was changed on setup screen)
if (setup_mode == SETUP_MODE_CHOOSE_WINDOW_SIZE)
execSetupGraphics_setScalingTypes();
execSetupGraphics_setRenderingModes();
+ execSetupGraphics_setVsyncModes(FALSE);
setup_mode = SETUP_MODE_GRAPHICS;
DrawSetupScreen();
+ // check if game speed is high enough for 60 Hz vsync to work
+ if (check_game_speed)
+ ModifyGameSpeedIfNeeded();
+
#if defined(TARGET_SDL2)
// window scaling may have changed at this point
ToggleFullscreenOrChangeWindowScalingIfNeeded();
// screen rendering mode may have changed at this point
SDLSetScreenRenderingMode(setup.screen_rendering_mode);
+
+ // screen vsync mode may have changed at this point
+ SDLSetScreenVsyncMode(setup.vsync_mode);
#endif
}
-#if defined(TARGET_SDL2) && !defined(PLATFORM_ANDROID)
-static void execSetupChooseWindowSize()
+static void execSetupChooseWindowSize(void)
{
setup_mode = SETUP_MODE_CHOOSE_WINDOW_SIZE;
DrawSetupScreen();
}
-static void execSetupChooseScalingType()
+static void execSetupChooseScalingType(void)
{
setup_mode = SETUP_MODE_CHOOSE_SCALING_TYPE;
DrawSetupScreen();
}
-static void execSetupChooseRenderingMode()
+static void execSetupChooseRenderingMode(void)
{
setup_mode = SETUP_MODE_CHOOSE_RENDERING;
DrawSetupScreen();
}
-#endif
-static void execSetupChooseVolumeSimple()
+static void execSetupChooseVsyncMode(void)
+{
+ setup_mode = SETUP_MODE_CHOOSE_VSYNC;
+
+ DrawSetupScreen();
+}
+
+static void execSetupChooseVolumeSimple(void)
{
setup_mode = SETUP_MODE_CHOOSE_VOLUME_SIMPLE;
DrawSetupScreen();
}
-static void execSetupChooseVolumeLoops()
+static void execSetupChooseVolumeLoops(void)
{
setup_mode = SETUP_MODE_CHOOSE_VOLUME_LOOPS;
DrawSetupScreen();
}
-static void execSetupChooseVolumeMusic()
+static void execSetupChooseVolumeMusic(void)
{
setup_mode = SETUP_MODE_CHOOSE_VOLUME_MUSIC;
DrawSetupScreen();
}
-static void execSetupSound()
+static void execSetupSound(void)
{
if (volumes_simple == NULL)
{
DrawSetupScreen();
}
-static void execSetupChooseTouchControls()
+static void execSetupChooseTouchControls(void)
{
setup_mode = SETUP_MODE_CHOOSE_TOUCH_CONTROL;
DrawSetupScreen();
}
-static void execSetupChooseMoveDistance()
+static void execSetupChooseMoveDistance(void)
{
setup_mode = SETUP_MODE_CHOOSE_MOVE_DISTANCE;
DrawSetupScreen();
}
-static void execSetupChooseDropDistance()
+static void execSetupChooseDropDistance(void)
{
setup_mode = SETUP_MODE_CHOOSE_DROP_DISTANCE;
DrawSetupScreen();
}
-static void execSetupTouch()
+static void execSetupChooseTransparency(void)
+{
+ setup_mode = SETUP_MODE_CHOOSE_TRANSPARENCY;
+
+ DrawSetupScreen();
+}
+
+static void execSetupChooseGridXSize_0(void)
+{
+ setup_mode = SETUP_MODE_CHOOSE_GRID_XSIZE_0;
+
+ DrawSetupScreen();
+}
+
+static void execSetupChooseGridYSize_0(void)
+{
+ setup_mode = SETUP_MODE_CHOOSE_GRID_YSIZE_0;
+
+ DrawSetupScreen();
+}
+
+static void execSetupChooseGridXSize_1(void)
+{
+ setup_mode = SETUP_MODE_CHOOSE_GRID_XSIZE_1;
+
+ DrawSetupScreen();
+}
+
+static void execSetupChooseGridYSize_1(void)
+{
+ setup_mode = SETUP_MODE_CHOOSE_GRID_YSIZE_1;
+
+ DrawSetupScreen();
+}
+
+static void execSetupConfigureVirtualButtons(void)
+{
+ setup_mode = SETUP_MODE_CONFIG_VIRT_BUTTONS;
+
+ ConfigureVirtualButtons();
+
+ setup_mode = SETUP_MODE_TOUCH;
+
+ DrawSetupScreen();
+}
+
+static void execSetupTouch(void)
{
+ int i, j, k;
+
if (touch_controls == NULL)
{
- int i;
-
for (i = 0; touch_controls_list[i].value != NULL; i++)
{
TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED);
if (move_distances == NULL)
{
- int i;
-
for (i = 0; distances_list[i].value != -1; i++)
{
TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED);
/* if that fails, set current distance to reliable default value */
if (move_distance_current == NULL)
move_distance_current =
- getTreeInfoFromIdentifier(move_distances, i_to_a(1));
+ getTreeInfoFromIdentifier(move_distances,
+ i_to_a(TOUCH_MOVE_DISTANCE_DEFAULT));
/* if that also fails, set current distance to first available value */
if (move_distance_current == NULL)
if (drop_distances == NULL)
{
- int i;
-
for (i = 0; distances_list[i].value != -1; i++)
{
TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED);
/* if that fails, set current distance to reliable default value */
if (drop_distance_current == NULL)
drop_distance_current =
- getTreeInfoFromIdentifier(drop_distances, i_to_a(1));
+ getTreeInfoFromIdentifier(drop_distances,
+ i_to_a(TOUCH_DROP_DISTANCE_DEFAULT));
/* if that also fails, set current distance to first available value */
if (drop_distance_current == NULL)
drop_distance_current = drop_distances;
}
- setup.touch.control_type = touch_control_current->identifier;
- setup.touch.move_distance = atoi(move_distance_current->identifier);
- setup.touch.drop_distance = atoi(drop_distance_current->identifier);
+ if (transparencies == NULL)
+ {
+ for (i = 0; transparencies_list[i].value != -1; i++)
+ {
+ TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED);
+ char identifier[32], name[32];
+ int value = transparencies_list[i].value;
+ char *text = transparencies_list[i].text;
- /* needed for displaying volume text instead of identifier */
- touch_controls_text = touch_control_current->name;
- move_distance_text = move_distance_current->name;
- drop_distance_text = drop_distance_current->name;
+ ti->node_top = &transparencies;
+ ti->sort_priority = value;
- setup_mode = SETUP_MODE_TOUCH;
+ sprintf(identifier, "%d", value);
+ sprintf(name, "%s", text);
- DrawSetupScreen();
-}
+ setString(&ti->identifier, identifier);
+ setString(&ti->name, name);
+ setString(&ti->name_sorting, name);
+ setString(&ti->infotext, STR_SETUP_CHOOSE_TRANSPARENCY);
-static void execSetupArtwork()
-{
-#if 0
- printf("::: '%s', '%s', '%s'\n",
- artwork.gfx_current->subdir,
- artwork.gfx_current->fullpath,
- artwork.gfx_current->basepath);
-#endif
+ pushTreeInfo(&transparencies, ti);
+ }
- setup.graphics_set = artwork.gfx_current->identifier;
- setup.sounds_set = artwork.snd_current->identifier;
- setup.music_set = artwork.mus_current->identifier;
+ /* sort transparency values to start with lowest transparency value */
+ sortTreeInfo(&transparencies);
- /* needed if last screen (setup choice) changed graphics, sounds or music */
- ReloadCustomArtwork(0);
+ /* set current transparency value to configured transparency value */
+ transparency_current =
+ getTreeInfoFromIdentifier(transparencies,
+ i_to_a(setup.touch.transparency));
- /* needed for displaying artwork name instead of artwork identifier */
- graphics_set_name = artwork.gfx_current->name;
- sounds_set_name = artwork.snd_current->name;
- music_set_name = artwork.mus_current->name;
+ /* if that fails, set current transparency to reliable default value */
+ if (transparency_current == NULL)
+ transparency_current =
+ getTreeInfoFromIdentifier(transparencies,
+ i_to_a(TOUCH_TRANSPARENCY_DEFAULT));
- setup_mode = SETUP_MODE_ARTWORK;
+ /* if that also fails, set current transparency to first available value */
+ if (transparency_current == NULL)
+ transparency_current = transparencies;
+ }
+
+ for (i = 0; i < 2; i++)
+ {
+ for (j = 0; j < 2; j++)
+ {
+ if (grid_sizes[i][j] == NULL)
+ {
+ for (k = 0; grid_sizes_list[k].value != -1; k++)
+ {
+ TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED);
+ char identifier[32], name[32];
+ int value = grid_sizes_list[k].value;
+ char *text = grid_sizes_list[k].text;
+
+ ti->node_top = &grid_sizes[i][j];
+ 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,
+ (i == 0 ?
+ (j == 0 ?
+ STR_SETUP_CHOOSE_GRID_XSIZE_0 :
+ STR_SETUP_CHOOSE_GRID_YSIZE_0) :
+ (j == 0 ?
+ STR_SETUP_CHOOSE_GRID_XSIZE_1 :
+ STR_SETUP_CHOOSE_GRID_YSIZE_1)));
+
+ pushTreeInfo(&grid_sizes[i][j], ti);
+ }
+
+ /* sort grid size values to start with lowest grid size value */
+ sortTreeInfo(&grid_sizes[i][j]);
+
+ /* set current grid size value to configured grid size value */
+ grid_size_current[i][j] =
+ getTreeInfoFromIdentifier(grid_sizes[i][j],
+ i_to_a(j == 0 ?
+ setup.touch.grid_xsize[i] :
+ setup.touch.grid_ysize[i]));
+
+ /* if that fails, set current grid size to reliable default value */
+ if (grid_size_current[i][j] == NULL)
+ grid_size_current[i][j] =
+ getTreeInfoFromIdentifier(grid_sizes[i][j],
+ i_to_a(j == 0 ?
+ DEFAULT_GRID_XSIZE(i) :
+ DEFAULT_GRID_YSIZE(i)));
+
+ /* if that also fails, set current grid size to first available value */
+ if (grid_size_current[i][j] == NULL)
+ grid_size_current[i][j] = grid_sizes[i][j];
+ }
+ }
+ }
+
+ setup.touch.control_type = touch_control_current->identifier;
+ setup.touch.move_distance = atoi(move_distance_current->identifier);
+ setup.touch.drop_distance = atoi(drop_distance_current->identifier);
+ setup.touch.transparency = atoi(transparency_current->identifier);
+
+ for (i = 0; i < 2; i++)
+ {
+ setup.touch.grid_xsize[i] = atoi(grid_size_current[i][0]->identifier);
+ setup.touch.grid_ysize[i] = atoi(grid_size_current[i][1]->identifier);
+
+ if (i == GRID_ACTIVE_NR())
+ {
+ overlay.grid_xsize = setup.touch.grid_xsize[i];
+ overlay.grid_ysize = setup.touch.grid_ysize[i];
+ }
+ }
+
+ /* needed for displaying value text instead of identifier */
+ touch_controls_text = touch_control_current->name;
+ move_distance_text = move_distance_current->name;
+ drop_distance_text = drop_distance_current->name;
+ transparency_text = transparency_current->name;
+
+ for (i = 0; i < 2; i++)
+ for (j = 0; j < 2; j++)
+ grid_size_text[i][j] = grid_size_current[i][j]->name;
+
+ setup_mode = SETUP_MODE_TOUCH;
+
+ DrawSetupScreen();
+}
+
+static void execSetupArtwork(void)
+{
+#if 0
+ printf("::: '%s', '%s', '%s'\n",
+ artwork.gfx_current->subdir,
+ artwork.gfx_current->fullpath,
+ artwork.gfx_current->basepath);
+#endif
+
+ setup.graphics_set = artwork.gfx_current->identifier;
+ setup.sounds_set = artwork.snd_current->identifier;
+ setup.music_set = artwork.mus_current->identifier;
+
+ /* needed if last screen (setup choice) changed graphics, sounds or music */
+ ReloadCustomArtwork(0);
+
+ /* needed for displaying artwork name instead of artwork identifier */
+ graphics_set_name = artwork.gfx_current->name;
+ sounds_set_name = artwork.snd_current->name;
+ music_set_name = artwork.mus_current->name;
+
+ setup_mode = SETUP_MODE_ARTWORK;
DrawSetupScreen();
}
-static void execSetupChooseGraphics()
+static void execSetupChooseGraphics(void)
{
setup_mode = SETUP_MODE_CHOOSE_GRAPHICS;
DrawSetupScreen();
}
-static void execSetupChooseSounds()
+static void execSetupChooseSounds(void)
{
setup_mode = SETUP_MODE_CHOOSE_SOUNDS;
DrawSetupScreen();
}
-static void execSetupChooseMusic()
+static void execSetupChooseMusic(void)
{
setup_mode = SETUP_MODE_CHOOSE_MUSIC;
DrawSetupScreen();
}
-static void execSetupInput()
+static void execSetupInput(void)
{
setup_mode = SETUP_MODE_INPUT;
DrawSetupScreen();
}
-static void execSetupShortcuts()
+static void execSetupShortcuts(void)
{
setup_mode = SETUP_MODE_SHORTCUTS;
DrawSetupScreen();
}
-static void execSetupShortcuts1()
+static void execSetupShortcuts1(void)
{
setup_mode = SETUP_MODE_SHORTCUTS_1;
DrawSetupScreen();
}
-static void execSetupShortcuts2()
+static void execSetupShortcuts2(void)
{
setup_mode = SETUP_MODE_SHORTCUTS_2;
DrawSetupScreen();
}
-static void execSetupShortcuts3()
+static void execSetupShortcuts3(void)
{
setup_mode = SETUP_MODE_SHORTCUTS_3;
DrawSetupScreen();
}
-static void execSetupShortcuts4()
+static void execSetupShortcuts4(void)
{
setup_mode = SETUP_MODE_SHORTCUTS_4;
DrawSetupScreen();
}
-static void execSetupShortcuts5()
+static void execSetupShortcuts5(void)
{
setup_mode = SETUP_MODE_SHORTCUTS_5;
DrawSetupScreen();
}
-static void execExitSetup()
+static void execExitSetup(void)
{
SetGameStatus(GAME_MODE_MAIN);
DrawMainMenu();
}
-static void execSaveAndExitSetup()
+static void execSaveAndExitSetup(void)
{
SaveSetup();
execExitSetup();
}
+static void execGadgetNetworkServer(void)
+{
+ int gadget_id = SCREEN_CTRL_ID_NETWORK_SERVER;
+ struct GadgetInfo *gi = screen_gadget[gadget_id];
+
+ if (strEqual(setup.network_server_hostname, STR_NETWORK_AUTO_DETECT))
+ network_server_hostname[0] = '\0';
+
+ ModifyGadget(gi, GDI_TEXT_VALUE, network_server_hostname, GDI_END);
+
+ MapGadget(gi);
+
+ ClickOnGadget(gi, MB_LEFTBUTTON);
+}
+
+static void ToggleNetworkModeIfNeeded(void)
+{
+ int font_title = FONT_TITLE_1;
+ int font_foot = FC_BLUE;
+ int ystart = mSY - SY + 16;
+ int ybottom = mSY - SY + SYSIZE - 20;
+ char *text = (setup.network_mode ? "Start Network" : "Stop Network");
+
+ if (setup.network_mode == network.enabled)
+ return;
+
+ network.enabled = setup.network_mode;
+
+ FadeOut(REDRAW_ALL);
+
+ ClearField();
+
+ DrawTextSCentered(ystart, font_title, text);
+
+ FadeIn(REDRAW_ALL);
+
+ if (network.enabled)
+ InitNetworkServer();
+ else
+ DisconnectFromNetworkServer();
+
+ DrawTextSCentered(ybottom, font_foot,
+ "Press any key or button for setup menu");
+
+ WaitForEventToContinue();
+
+ DrawSetupScreen();
+}
+
+static void ToggleGameSpeedsListIfNeeded(void)
+{
+ boolean using_game_speeds_extended = (game_speeds == game_speeds_extended);
+
+ if (setup.game_speed_extended == using_game_speeds_extended)
+ return;
+
+ /* try to match similar values when changing game speeds list */
+ if (setup.game_speed_extended)
+ setup.game_frame_delay = (setup.game_frame_delay == 15 ? 16 :
+ setup.game_frame_delay == 30 ? 29 :
+ setup.game_frame_delay);
+ else
+ setup.game_frame_delay = (setup.game_frame_delay == 14 ? 15 :
+ setup.game_frame_delay == 16 ? 15 :
+ setup.game_frame_delay >= 29 ? 30 :
+ setup.game_frame_delay <= 10 ? 10 :
+ setup.game_frame_delay);
+
+ execSetupGame_setGameSpeeds(TRUE);
+
+ DrawSetupScreen();
+}
+
+static void ModifyGameSpeedIfNeeded(void)
+{
+ if (strEqual(setup.vsync_mode, STR_VSYNC_MODE_OFF) ||
+ setup.game_frame_delay <= MAX_VSYNC_FRAME_DELAY)
+ return;
+
+ char message[100];
+ char *game_speed_text = "Fast";
+ int game_speed_value = 15;
+
+ if (setup.game_speed_extended)
+ {
+ game_speed_text = "60 fps";
+ game_speed_value = 16;
+ }
+
+ sprintf(message, "Game speed set to %s for VSync to work!", game_speed_text);
+
+ /* set game speed to existing list value that is fast enough for vsync */
+ setup.game_frame_delay = game_speed_value;
+
+ execSetupGame_setGameSpeeds(TRUE);
+
+ Request(message, REQ_CONFIRM);
+}
+
+static void DisableVsyncIfNeeded(void)
+{
+ if (strEqual(setup.vsync_mode, STR_VSYNC_MODE_OFF) ||
+ (setup.game_frame_delay >= MIN_VSYNC_FRAME_DELAY &&
+ setup.game_frame_delay <= MAX_VSYNC_FRAME_DELAY))
+ return;
+
+ /* disable vsync for the selected game speed to work */
+ setup.vsync_mode = STR_VSYNC_MODE_OFF;
+
+ execSetupGraphics_setVsyncModes(TRUE);
+
+ Request("VSync disabled for this game speed to work!", REQ_CONFIRM);
+}
+
+static struct
+{
+ void *value;
+ void *related_value;
+} hide_related_entry_list[] =
+{
+ { &setup.game_frame_delay, execSetupChooseGameSpeed },
+ { &setup.game_frame_delay, &game_speed_text },
+
+ { &setup.scroll_delay_value, execSetupChooseScrollDelay },
+ { &setup.scroll_delay_value, &scroll_delay_text },
+
+ { &setup.engine_snapshot_mode, execSetupChooseSnapshotMode },
+ { &setup.engine_snapshot_mode, &snapshot_mode_text },
+
+ { &setup.window_scaling_percent, execSetupChooseWindowSize },
+ { &setup.window_scaling_percent, &window_size_text },
+
+ { &setup.window_scaling_quality, execSetupChooseScalingType },
+ { &setup.window_scaling_quality, &scaling_type_text },
+
+ { &setup.screen_rendering_mode, execSetupChooseRenderingMode },
+ { &setup.screen_rendering_mode, &rendering_mode_text },
+
+ { &setup.vsync_mode, execSetupChooseVsyncMode },
+ { &setup.vsync_mode, &vsync_mode_text },
+
+ { &setup.graphics_set, execSetupChooseGraphics },
+ { &setup.graphics_set, &graphics_set_name },
+
+ { &setup.sounds_set, execSetupChooseSounds },
+ { &setup.sounds_set, &sounds_set_name },
+
+ { &setup.music_set, execSetupChooseMusic },
+ { &setup.music_set, &music_set_name },
+
+ { &setup.volume_simple, execSetupChooseVolumeSimple },
+ { &setup.volume_simple, &volume_simple_text },
+
+ { &setup.volume_loops, execSetupChooseVolumeLoops },
+ { &setup.volume_loops, &volume_loops_text },
+
+ { &setup.volume_music, execSetupChooseVolumeMusic },
+ { &setup.volume_music, &volume_music_text },
+
+ { &setup.touch.control_type, execSetupChooseTouchControls },
+ { &setup.touch.control_type, &touch_controls_text },
+
+ { &setup.touch.move_distance, execSetupChooseMoveDistance },
+ { &setup.touch.move_distance, &move_distance_text },
+
+ { &setup.touch.drop_distance, execSetupChooseDropDistance },
+ { &setup.touch.drop_distance, &drop_distance_text },
+
+ { &setup.touch.transparency, execSetupChooseTransparency },
+ { &setup.touch.transparency, &transparency_text },
+
+ { &setup.touch.grid_xsize[0], execSetupChooseGridXSize_0 },
+ { &setup.touch.grid_xsize[0], &grid_size_text[0][0] },
+
+ { &setup.touch.grid_ysize[0], execSetupChooseGridYSize_0 },
+ { &setup.touch.grid_ysize[0], &grid_size_text[0][1] },
+
+ { &setup.touch.grid_xsize[1], execSetupChooseGridXSize_1 },
+ { &setup.touch.grid_xsize[1], &grid_size_text[1][0] },
+
+ { &setup.touch.grid_ysize[1], execSetupChooseGridYSize_1 },
+ { &setup.touch.grid_ysize[1], &grid_size_text[1][1] },
+
+ { NULL, NULL }
+};
+
+void setHideRelatedSetupEntries(void)
+{
+ int i;
+
+ for (i = 0; hide_related_entry_list[i].value != NULL; i++)
+ if (hideSetupEntry(hide_related_entry_list[i].value))
+ setHideSetupEntry(hide_related_entry_list[i].related_value);
+}
+
static struct TokenInfo setup_info_main[] =
{
{ TYPE_ENTER_MENU, execSetupGame, STR_SETUP_GAME },
static struct TokenInfo setup_info_game[] =
{
{ TYPE_SWITCH, &setup.team_mode, "Team-Mode (Multi-Player):" },
+ { TYPE_SWITCH, &setup.network_mode, "Network Multi-Player Mode:" },
+ { TYPE_PLAYER, &setup.network_player_nr,"Preferred Network Player:" },
+ { TYPE_TEXT_INPUT, execGadgetNetworkServer, "Network Server Hostname:" },
+ { TYPE_STRING, &network_server_text, "" },
{ TYPE_YES_NO, &setup.input_on_focus, "Only Move Focussed Player:" },
{ TYPE_SWITCH, &setup.time_limit, "Time Limit:" },
{ TYPE_SWITCH, &setup.handicap, "Handicap:" },
{ TYPE_SWITCH, &setup.skip_levels, "Skip Unsolved Levels:" },
{ TYPE_SWITCH, &setup.increment_levels,"Increment Solved Levels:" },
+ { TYPE_SWITCH, &setup.auto_play_next_level,"Auto-play Next Level:" },
+ { TYPE_SWITCH, &setup.skip_scores_after_game,"Skip Scores After Game:" },
+ { TYPE_YES_NO, &setup.ask_on_game_over, "Ask on Game Over:" },
{ TYPE_SWITCH, &setup.autorecord, "Auto-Record Tapes:" },
{ TYPE_ENTER_LIST, execSetupChooseGameSpeed, "Game Speed:" },
{ TYPE_STRING, &game_speed_text, "" },
+ { TYPE_SWITCH, &setup.game_speed_extended, "Game Speed Extended List:" },
#if 1
{ TYPE_ENTER_LIST, execSetupChooseScrollDelay, "Scroll Delay:" },
{ TYPE_STRING, &scroll_delay_text, "" },
{ TYPE_ENTER_LIST, execSetupChooseScrollDelay, "Scroll Delay:" },
{ TYPE_STRING, &scroll_delay_text, "" },
#endif
+ { TYPE_ENTER_LIST, execSetupChooseVsyncMode, "Vertical Sync (VSync):" },
+ { TYPE_STRING, &vsync_mode_text, "" },
{ TYPE_SWITCH, &setup.fade_screens, "Fade Screens:" },
{ TYPE_SWITCH, &setup.quick_switch, "Quick Player Focus Switch:" },
{ TYPE_SWITCH, &setup.quick_doors, "Quick Menu Doors:" },
{ TYPE_SWITCH, NULL, "Player:" },
{ TYPE_SWITCH, NULL, "Device:" },
{ TYPE_SWITCH, NULL, "" },
+ { TYPE_SKIPPABLE, NULL, "" },
+ { TYPE_EMPTY, NULL, "" },
{ TYPE_EMPTY, NULL, "" },
{ TYPE_EMPTY, NULL, "" },
{ TYPE_EMPTY, NULL, "" },
{ TYPE_EMPTY, NULL, "" },
{ TYPE_EMPTY, NULL, "" },
{ TYPE_EMPTY, NULL, "" },
+ { TYPE_SKIPPABLE, NULL, "" },
+ { TYPE_LEAVE_MENU, execSetupMain, "Back" },
+
+ { 0, NULL, NULL }
+};
+
+static struct TokenInfo setup_info_touch[] =
+{
+ { TYPE_ENTER_LIST, execSetupChooseTouchControls, "Touch Control Type:" },
+ { TYPE_STRING, &touch_controls_text, "" },
+ { TYPE_EMPTY, NULL, "" },
+ { TYPE_LEAVE_MENU, execSetupMain, "Back" },
+
+ { 0, NULL, NULL }
+};
+
+static struct TokenInfo setup_info_touch_virtual_buttons_0[] =
+{
+ { TYPE_ENTER_LIST, execSetupChooseTouchControls, "Touch Control Type:" },
+ { TYPE_STRING, &touch_controls_text, "" },
{ TYPE_EMPTY, NULL, "" },
+ { TYPE_ENTER_LIST, execSetupChooseGridXSize_0, "Horizontal Buttons (Landscape):" },
+ { TYPE_STRING, &grid_size_text[0][0], "" },
+ { TYPE_ENTER_LIST, execSetupChooseGridYSize_0, "Vertical Buttons (Landscape):" },
+ { TYPE_STRING, &grid_size_text[0][1], "" },
+ { TYPE_ENTER_LIST, execSetupChooseTransparency, "Button Transparency:" },
+ { TYPE_STRING, &transparency_text, "" },
+ { TYPE_SWITCH, &setup.touch.draw_outlined, "Draw Buttons Outlined:" },
+ { TYPE_SWITCH, &setup.touch.draw_pressed, "Highlight Pressed Buttons:" },
{ TYPE_EMPTY, NULL, "" },
+ { TYPE_ENTER_LIST, execSetupConfigureVirtualButtons, "Configure Virtual Buttons" },
{ TYPE_EMPTY, NULL, "" },
{ TYPE_LEAVE_MENU, execSetupMain, "Back" },
{ 0, NULL, NULL }
};
-static struct TokenInfo setup_info_touch[] =
+static struct TokenInfo setup_info_touch_virtual_buttons_1[] =
{
{ TYPE_ENTER_LIST, execSetupChooseTouchControls, "Touch Control Type:" },
{ TYPE_STRING, &touch_controls_text, "" },
{ TYPE_EMPTY, NULL, "" },
+ { TYPE_ENTER_LIST, execSetupChooseGridXSize_1, "Horizontal Buttons (Portrait):" },
+ { TYPE_STRING, &grid_size_text[1][0], "" },
+ { TYPE_ENTER_LIST, execSetupChooseGridYSize_1, "Vertical Buttons (Portrait):" },
+ { TYPE_STRING, &grid_size_text[1][1], "" },
+ { TYPE_ENTER_LIST, execSetupChooseTransparency, "Button Transparency:" },
+ { TYPE_STRING, &transparency_text, "" },
+ { TYPE_SWITCH, &setup.touch.draw_outlined, "Draw Buttons Outlined:" },
+ { TYPE_SWITCH, &setup.touch.draw_pressed, "Highlight Pressed Buttons:" },
+ { TYPE_EMPTY, NULL, "" },
+ { TYPE_ENTER_LIST, execSetupConfigureVirtualButtons, "Configure Virtual Buttons" },
+ { TYPE_EMPTY, NULL, "" },
{ TYPE_LEAVE_MENU, execSetupMain, "Back" },
{ 0, NULL, NULL }
};
+static struct TokenInfo *setup_info_touch_virtual_buttons[] =
+{
+ setup_info_touch_virtual_buttons_0,
+ setup_info_touch_virtual_buttons_1
+};
+
static struct TokenInfo setup_info_touch_wipe_gestures[] =
{
{ TYPE_ENTER_LIST, execSetupChooseTouchControls, "Touch Control Type:" },
{ 0, NULL, NULL }
};
-static Key getSetupKey()
+static Key getSetupKey(void)
{
Key key = KSYM_UNDEFINED;
boolean got_key_event = FALSE;
else if (type & TYPE_YES_NO_AUTO)
return (*(int *)value == AUTO ? FONT_OPTION_ON :
*(int *)value == FALSE ? FONT_OPTION_OFF : FONT_OPTION_ON);
+ else if (type & TYPE_PLAYER)
+ return FONT_VALUE_1;
else
return FONT_VALUE_1;
}
int ypos = MENU_SCREEN_START_YPOS + screen_pos;
int startx = mSX + xpos * 32;
int starty = mSY + ypos * 32;
- int font_nr, font_nr_default, font_width_default;
int type = si->type;
void *value = si->value;
char *value_string = getSetupValue(type, value);
+ int font_nr_default = getSetupValueFont(type, value);
+ int font_width_default = getFontWidth(font_nr_default);
+ int font_nr = font_nr_default;
int i;
if (value_string == NULL)
}
else if (type & TYPE_STRING)
{
- int max_value_len = (SCR_FIELDX - 2) * 2;
+ int max_value_len = (SXSIZE - 2 * TILEX) / font_width_default;
xpos = MENU_SCREEN_START_XPOS;
{
xpos = menu_screen_value_xpos - 1;
}
+ else if (type & TYPE_PLAYER)
+ {
+ int displayed_player_nr = *(int *)value + 1;
+
+ value_string = getSetupValue(TYPE_INTEGER, (void *)&displayed_player_nr);
+ }
startx = mSX + xpos * 32;
starty = mSY + ypos * 32;
- font_nr_default = getSetupValueFont(type, value);
- font_width_default = getFontWidth(font_nr_default);
-
- font_nr = font_nr_default;
// special check if right-side setup values moved left due to scrollbar
if (scrollbar_needed && xpos > MENU_SCREEN_START_XPOS)
DrawText(startx, starty, value_string, font_nr);
+ if (type & TYPE_PLAYER)
+ {
+ struct FontBitmapInfo *font = getFontBitmapInfo(font_nr);
+ int player_nr = *(int *)value;
+ int xoff = font->draw_xoffset + getFontWidth(font_nr);
+ int yoff = font->draw_yoffset + (getFontHeight(font_nr) - TILEY) / 2;
+ int startx2 = startx + xoff;
+ int starty2 = starty + yoff;
+
+ if (DrawingOnBackground(startx2, starty2))
+ ClearRectangleOnBackground(drawto, startx2, starty2, TILEX, TILEY);
+
+ DrawFixedGraphicThruMaskExt(drawto, startx2, starty2,
+ PLAYER_NR_GFX(IMG_PLAYER_1, player_nr), 0);
+ }
+
if (font_draw_xoffset_modified)
getFontBitmapInfo(font_nr)->draw_xoffset = font_draw_xoffset_old;
}
if (key != KSYM_UNDEFINED)
*(Key *)si->value = key;
}
+ else if (si->type & TYPE_PLAYER)
+ {
+ int player_nr = *(int *)si->value;
+
+ if (dx)
+ player_nr += dx;
+ else
+ player_nr = Request("Choose player", REQ_PLAYER) - 1;
+
+ *(int *)si->value = MIN(MAX(0, player_nr), MAX_PLAYERS - 1);
+ }
drawSetupValue(screen_pos, setup_info_pos_raw);
// fullscreen state may have changed at this point
if (si->value == &setup.fullscreen)
ToggleFullscreenOrChangeWindowScalingIfNeeded();
+
+ // network mode may have changed at this point
+ if (si->value == &setup.network_mode)
+ ToggleNetworkModeIfNeeded();
+
+ // game speed list may have changed at this point
+ if (si->value == &setup.game_speed_extended)
+ ToggleGameSpeedsListIfNeeded();
}
static struct TokenInfo *getSetupInfoFinal(struct TokenInfo *setup_info_orig)
{
- static struct TokenInfo *setup_info_hide = NULL;
+ static struct TokenInfo *setup_info_final = NULL;
int list_size = 0;
int list_pos = 0;
int i;
while (setup_info_orig[list_size++].type != 0);
/* free, allocate and clear memory for target list */
- checked_free(setup_info_hide);
- setup_info_hide = checked_calloc(list_size * sizeof(struct TokenInfo));
+ checked_free(setup_info_final);
+ setup_info_final = checked_calloc(list_size * sizeof(struct TokenInfo));
/* copy setup info list without setup entries marked as hidden */
for (i = 0; setup_info_orig[i].type != 0; i++)
- if (!hideSetupEntry(setup_info_orig[i].value))
- setup_info_hide[list_pos++] = setup_info_orig[i];
+ {
+ /* skip setup entries configured to be hidden */
+ if (hideSetupEntry(setup_info_orig[i].value))
+ continue;
- return setup_info_hide;
+ /* skip skippable setup entries if screen is lower than usual */
+ if (SCR_FIELDY < SCR_FIELDY_DEFAULT &&
+ setup_info_orig[i].type == TYPE_SKIPPABLE)
+ continue;
+
+ setup_info_final[list_pos++] = setup_info_orig[i];
+ }
+
+ return setup_info_final;
}
-static void DrawSetupScreen_Generic()
+static void DrawSetupScreen_Generic(void)
{
int fade_mask = REDRAW_FIELD;
boolean redraw_all = FALSE;
setup_info = setup_info_touch;
title_string = STR_SETUP_TOUCH;
- if (strEqual(setup.touch.control_type, TOUCH_CONTROL_WIPE_GESTURES))
+ if (strEqual(setup.touch.control_type, TOUCH_CONTROL_VIRTUAL_BUTTONS))
+ setup_info = setup_info_touch_virtual_buttons[GRID_ACTIVE_NR()];
+ else if (strEqual(setup.touch.control_type, TOUCH_CONTROL_WIPE_GESTURES))
setup_info = setup_info_touch_wipe_gestures;
}
else if (setup_mode == SETUP_MODE_SHORTCUTS)
setup_mode, num_setup_info, max_setup_info);
}
-void DrawSetupScreen_Input()
+static void DrawSetupScreen_Input(void)
{
int i;
ClearField();
- setup_info = setup_info_input;
+ setup_info = getSetupInfoFinal(setup_info_input);
DrawTextSCentered(mSY - SY + 16, FONT_TITLE_1, STR_SETUP_INPUT);
- for (i = 0; setup_info[i].type != 0 && i < MAX_MENU_ENTRIES_ON_SCREEN; i++)
+ for (i = 0; setup_info[i].type != 0; i++)
{
if (setup_info[i].type & (TYPE_ENTER_MENU|TYPE_ENTER_LIST))
initCursor(i, IMG_MENU_BUTTON_ENTER_MENU);
"Joystick3",
"Joystick4"
};
- int text_font_nr = (active ? FONT_MENU_1_ACTIVE : FONT_MENU_1);
+ int font_nr_menu = (active ? FONT_MENU_1_ACTIVE : FONT_MENU_1);
+ int font_nr_info = FONT_MENU_1;
+ int font_nr_name = FONT_VALUE_OLD;
+ int font_nr_on = FONT_VALUE_1;
+ int font_nr_off = FONT_VALUE_OLD;
+ int pos = 4;
+
+ if (SCR_FIELDX < SCR_FIELDX_DEFAULT)
+ {
+ font_nr_info = FONT_MENU_2;
+ font_nr_on = FONT_VALUE_NARROW;
+ font_nr_off = FONT_VALUE_OLD_NARROW;
+ }
custom_key = setup.input[player_nr].key;
int joystick_nr = getJoystickNrFromDeviceName(device_name);
boolean joystick_active = CheckJoystickOpened(joystick_nr);
char *text = joystick_name[joystick_nr];
- int font_nr = (joystick_active ? FONT_VALUE_1 : FONT_VALUE_OLD);
+ int font_nr = (joystick_active ? font_nr_on : font_nr_off);
DrawText(mSX + 8 * 32, mSY + 3 * 32, text, font_nr);
- DrawText(mSX + 32, mSY + 4 * 32, "Configure", text_font_nr);
+ DrawText(mSX + 32, mSY + 4 * 32, "Configure", font_nr_menu);
}
else
{
- DrawText(mSX + 8 * 32, mSY + 3 * 32, "Keyboard ", FONT_VALUE_1);
- DrawText(mSX + 1 * 32, mSY + 4 * 32, "Customize", text_font_nr);
+ DrawText(mSX + 8 * 32, mSY + 3 * 32, "Keyboard ", font_nr_on);
+ DrawText(mSX + 1 * 32, mSY + 4 * 32, "Customize", font_nr_menu);
}
- DrawText(mSX + 32, mSY + 5 * 32, "Actual Settings:", FONT_MENU_1);
+ if (SCR_FIELDY >= SCR_FIELDY_DEFAULT)
+ DrawText(mSX + 32, mSY + 5 * 32, "Actual Settings:", font_nr_info);
+ else
+ pos = 3;
- drawCursorXY(1, 4, IMG_MENU_BUTTON_LEFT);
- drawCursorXY(1, 5, IMG_MENU_BUTTON_RIGHT);
- drawCursorXY(1, 6, IMG_MENU_BUTTON_UP);
- drawCursorXY(1, 7, IMG_MENU_BUTTON_DOWN);
+ drawCursorXY(1, pos + 0, IMG_MENU_BUTTON_LEFT);
+ drawCursorXY(1, pos + 1, IMG_MENU_BUTTON_RIGHT);
+ drawCursorXY(1, pos + 2, IMG_MENU_BUTTON_UP);
+ drawCursorXY(1, pos + 3, IMG_MENU_BUTTON_DOWN);
- DrawText(mSX + 2 * 32, mSY + 6 * 32, ":", FONT_VALUE_OLD);
- DrawText(mSX + 2 * 32, mSY + 7 * 32, ":", FONT_VALUE_OLD);
- DrawText(mSX + 2 * 32, mSY + 8 * 32, ":", FONT_VALUE_OLD);
- DrawText(mSX + 2 * 32, mSY + 9 * 32, ":", FONT_VALUE_OLD);
- DrawText(mSX + 1 * 32, mSY + 10 * 32, "Snap Field:", FONT_VALUE_OLD);
- DrawText(mSX + 1 * 32, mSY + 12 * 32, "Drop Element:", FONT_VALUE_OLD);
+ DrawText(mSX + 2 * 32, mSY + (pos + 2) * 32, ":", font_nr_name);
+ DrawText(mSX + 2 * 32, mSY + (pos + 3) * 32, ":", font_nr_name);
+ DrawText(mSX + 2 * 32, mSY + (pos + 4) * 32, ":", font_nr_name);
+ DrawText(mSX + 2 * 32, mSY + (pos + 5) * 32, ":", font_nr_name);
+ DrawText(mSX + 1 * 32, mSY + (pos + 6) * 32, "Snap Field:", font_nr_name);
+ DrawText(mSX + 1 * 32, mSY + (pos + 8) * 32, "Drop Element:", font_nr_name);
for (i = 0; i < 6; i++)
{
- int ypos = 6 + i + (i > 3 ? i-3 : 0);
+ int ypos = (pos + 2) + i + (i > 3 ? i - 3 : 0);
DrawText(mSX + 3 * 32, mSY + ypos * 32,
- " ", FONT_VALUE_1);
+ " ", font_nr_on);
DrawText(mSX + 3 * 32, mSY + ypos * 32,
(setup.input[player_nr].use_joystick ?
custom[i].text :
- getKeyNameFromKey(*custom[i].key)), FONT_VALUE_1);
+ getKeyNameFromKey(*custom[i].key)), font_nr_on);
}
}
static int input_player_nr = 0;
-void HandleSetupScreen_Input_Player(int step, int direction)
+static void HandleSetupScreen_Input_Player(int step, int direction)
{
int old_player_nr = input_player_nr;
int new_player_nr;
int pos_empty2 = SETUPINPUT_SCREEN_POS_EMPTY2;
int pos_end = SETUPINPUT_SCREEN_POS_END;
+ if (SCR_FIELDY < SCR_FIELDY_DEFAULT)
+ {
+ int i;
+
+ for (i = 0; setup_info_input[i].type != 0; i++)
+ {
+ /* adjust menu structure according to skipped setup entries */
+ if (setup_info_input[i].type == TYPE_SKIPPABLE)
+ {
+ pos_empty2--;
+ pos_end--;
+ }
+ }
+ }
+
if (button == MB_MENU_INITIALIZE)
{
+ /* input setup menu may have changed size due to graphics configuration */
+ if (choice >= pos_empty1)
+ choice = pos_end;
+
drawPlayerSetupInputInfo(input_player_nr, (choice == 2));
DrawCursorAndText_Setup(choice, -1, TRUE);
}
}
-void CustomizeKeyboard(int player_nr)
+static boolean CustomizeKeyboardMain(int player_nr)
{
int i;
int step_nr;
{ &custom_key.snap, "Snap Field" },
{ &custom_key.drop, "Drop Element" }
};
+ int font_nr_old = FONT_VALUE_OLD;
+ int font_nr_new = FONT_VALUE_1;
+ boolean success = FALSE;
+
+ if (SCR_FIELDX < SCR_FIELDX_DEFAULT)
+ {
+ font_nr_old = FONT_VALUE_OLD_NARROW;
+ font_nr_new = FONT_VALUE_NARROW;
+ }
/* read existing key bindings from player setup */
custom_key = setup.input[player_nr].key;
DrawText(mSX, mSY + (2 + 2 * step_nr + 1) * 32,
"Key:", FONT_INPUT_1_ACTIVE);
DrawText(mSX + 4 * 32, mSY + (2 + 2 * step_nr + 1) * 32,
- getKeyNameFromKey(*customize_step[step_nr].key), FONT_VALUE_OLD);
+ getKeyNameFromKey(*customize_step[step_nr].key), font_nr_old);
FadeIn(REDRAW_FIELD);
{
Key key = GetEventKey((KeyEvent *)&event, FALSE);
- if (key == KSYM_Escape || (key == KSYM_Return && step_nr == 6))
+ /* press 'Escape' to abort and keep the old key bindings */
+ if (key == KSYM_Escape)
{
- if (key == KSYM_Escape)
- FadeSkipNextFadeIn();
+ FadeSkipNextFadeIn();
finished = TRUE;
- break;
- }
- /* all keys configured -- wait for "Escape" or "Return" key */
- if (step_nr == 6)
break;
+ }
/* press 'Enter' to keep the existing key binding */
if (key == KSYM_Return)
/* got new key binding */
*customize_step[step_nr].key = key;
DrawText(mSX + 4 * 32, mSY + (2 + 2 * step_nr + 1) * 32,
- " ", FONT_VALUE_1);
+ " ", font_nr_new);
DrawText(mSX + 4 * 32, mSY + (2 + 2 * step_nr + 1) * 32,
- getKeyNameFromKey(key), FONT_VALUE_1);
+ getKeyNameFromKey(key), font_nr_new);
step_nr++;
/* un-highlight last query */
DrawText(mSX, mSY + (2 + 2 * (step_nr - 1) + 1) * 32,
"Key:", FONT_MENU_1);
- /* press 'Enter' to leave */
+ /* all keys configured */
if (step_nr == 6)
{
- DrawText(mSX + 16, mSY + 15 * 32 + 16,
- "Press Enter", FONT_TITLE_1);
+ finished = TRUE;
+ success = TRUE;
+
break;
}
"Key:", FONT_INPUT_1_ACTIVE);
DrawText(mSX + 4 * 32, mSY + (2 + 2 * step_nr + 1) * 32,
getKeyNameFromKey(*customize_step[step_nr].key),
- FONT_VALUE_OLD);
+ font_nr_old);
}
break;
BackToFront();
}
- /* write new key bindings back to player setup */
- setup.input[player_nr].key = custom_key;
+ /* write new key bindings back to player setup, if successfully finished */
+ if (success)
+ setup.input[player_nr].key = custom_key;
+
+ return success;
+}
+
+void CustomizeKeyboard(int player_nr)
+{
+ boolean success = CustomizeKeyboardMain(player_nr);
+
+ if (success)
+ {
+ int font_nr = FONT_TITLE_1;
+ 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;
+
+ ResetDelayCounter(&wait_frame_delay);
+
+ ClearField();
+
+ DrawTextSCentered(ypos1, font_nr, "Keyboard");
+ DrawTextSCentered(ypos2, font_nr, "configured!");
+
+ while (!DelayReached(&wait_frame_delay, wait_frame_delay_value))
+ BackToFront();
+
+ ClearEventQueue();
+ }
DrawSetupScreen_Input();
}
controller->width, controller->height,
controller_x, controller_y);
+ SDL_SetSurfaceBlendMode(marker->surface_masked, SDL_BLENDMODE_BLEND);
SDL_SetSurfaceAlphaMod(marker->surface_masked, alpha);
BlitBitmapMasked(marker, drawto, 0, 0,
/* leave screen */
success = FALSE;
done = TRUE;
+
+ break;
}
/* undo this step */
if (state != JOYSTICK_NOT_CONFIGURED)
{
boolean success = (state == JOYSTICK_CONFIGURED);
- char *message = (success ? " IS CONFIGURED! " : " NOT AVAILABLE! ");
+ char message1[MAX_OUTPUT_LINESIZE + 1];
+ char *message2 = (success ? "configured!" : "not available!");
char *device_name = setup.input[player_nr].joy.device_name;
int nr = getJoystickNrFromDeviceName(device_name) + 1;
- int xpos = mSX - SX;
- int ypos = mSY - SY;
+ int font_nr = FONT_TITLE_1;
+ 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;
ClearField();
- DrawTextF(xpos + 16, ypos + 6 * 32, FONT_TITLE_1, " JOYSTICK %d ", nr);
- DrawTextF(xpos + 16, ypos + 7 * 32, FONT_TITLE_1, message);
+ sprintf(message1, "Joystick %d", nr);
+
+ DrawTextSCentered(ypos1, font_nr, message1);
+ DrawTextSCentered(ypos2, font_nr, message2);
while (!DelayReached(&wait_frame_delay, wait_frame_delay_value))
BackToFront();
DrawSetupScreen_Input();
}
-void DrawSetupScreen()
+static boolean ConfigureVirtualButtonsMain(void)
{
- if (setup_mode == SETUP_MODE_INPUT)
- DrawSetupScreen_Input();
- else if (setup_mode == SETUP_MODE_CHOOSE_GAME_SPEED)
- DrawChooseTree(&game_speed_current);
- else if (setup_mode == SETUP_MODE_CHOOSE_SCROLL_DELAY)
- DrawChooseTree(&scroll_delay_current);
- else if (setup_mode == SETUP_MODE_CHOOSE_SNAPSHOT_MODE)
- DrawChooseTree(&snapshot_mode_current);
- else if (setup_mode == SETUP_MODE_CHOOSE_WINDOW_SIZE)
- 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);
+ static char *customize_step_text[] =
+ {
+ "Move Left",
+ "Move Right",
+ "Move Up",
+ "Move Down",
+ "Snap Field",
+ "Drop Element"
+ };
+ char grid_button[] =
+ {
+ CHAR_GRID_BUTTON_LEFT,
+ CHAR_GRID_BUTTON_RIGHT,
+ CHAR_GRID_BUTTON_UP,
+ CHAR_GRID_BUTTON_DOWN,
+ CHAR_GRID_BUTTON_SNAP,
+ CHAR_GRID_BUTTON_DROP
+ };
+ int font_nr = FONT_INPUT_1_ACTIVE;
+ int font_height = getFontHeight(font_nr);
+ int ypos1 = SYSIZE / 2 - font_height * 2;
+ int ypos2 = SYSIZE / 2 - font_height * 1;
+ boolean success = FALSE;
+ boolean finished = FALSE;
+ int step_nr = 0;
+ char grid_button_draw = CHAR_GRID_BUTTON_NONE;
+ char grid_button_old[MAX_GRID_XSIZE][MAX_GRID_YSIZE];
+ char grid_button_tmp[MAX_GRID_XSIZE][MAX_GRID_YSIZE];
+ boolean set_grid_button = FALSE;
+ int nr = GRID_ACTIVE_NR();
+ int x, y;
+
+ for (x = 0; x < MAX_GRID_XSIZE; x++)
+ for (y = 0; y < MAX_GRID_YSIZE; y++)
+ grid_button_old[x][y] = grid_button_tmp[x][y] = overlay.grid_button[x][y];
+
+ overlay.grid_button_highlight = grid_button[step_nr];
+
+ FadeSetEnterMenu();
+ FadeOut(REDRAW_FIELD);
+
+ ClearField();
+
+ DrawTextSCentered(mSY - SY + 16, FONT_TITLE_1, "Virtual Buttons");
+ DrawTextSCentered(ypos1, font_nr, "Select tiles to");
+ DrawTextSCentered(ypos2, font_nr, customize_step_text[step_nr]);
+
+ FadeIn(REDRAW_FIELD);
+
+ SetOverlayShowGrid(TRUE);
+
+ while (!finished)
+ {
+ Event event;
+
+ while (NextValidEvent(&event))
+ {
+ switch (event.type)
+ {
+ case EVENT_KEYPRESS:
+ {
+ Key key = GetEventKey((KeyEvent *)&event, FALSE);
+
+ /* press 'Escape' to abort and keep the old key bindings */
+ if (key == KSYM_Escape)
+ {
+ for (x = 0; x < MAX_GRID_XSIZE; x++)
+ for (y = 0; y < MAX_GRID_YSIZE; y++)
+ overlay.grid_button[x][y] = grid_button_old[x][y];
+
+ FadeSkipNextFadeIn();
+
+ finished = TRUE;
+
+ break;
+ }
+
+ /* press 'Enter' to keep the existing key binding */
+ if (key == KSYM_Return ||
+#if defined(TARGET_SDL2)
+ key == KSYM_Menu ||
+#endif
+ key == KSYM_space)
+ {
+ step_nr++;
+ }
+ else if (key == KSYM_BackSpace
+#if defined(TARGET_SDL2)
+ ||
+ key == KSYM_Back
+#endif
+ )
+ {
+ if (step_nr == 0)
+ {
+ FadeSkipNextFadeIn();
+
+ finished = TRUE;
+
+ break;
+ }
+
+ step_nr--;
+ }
+ else
+ {
+ break;
+ }
+
+ /* all virtual buttons configured */
+ if (step_nr == 6)
+ {
+ finished = TRUE;
+ success = TRUE;
+
+ break;
+ }
+
+ for (x = 0; x < MAX_GRID_XSIZE; x++)
+ for (y = 0; y < MAX_GRID_YSIZE; y++)
+ grid_button_tmp[x][y] = overlay.grid_button[x][y];
+
+ overlay.grid_button_highlight = grid_button[step_nr];
+
+ /* query next virtual button */
+
+ ClearField();
+
+ DrawTextSCentered(mSY - SY + 16, FONT_TITLE_1, "Virtual Buttons");
+ DrawTextSCentered(ypos1, font_nr, "Select tiles to");
+ DrawTextSCentered(ypos2, font_nr, customize_step_text[step_nr]);
+ }
+ break;
+
+ case EVENT_KEYRELEASE:
+ key_joystick_mapping = 0;
+ break;
+
+ case EVENT_BUTTONPRESS:
+ case EVENT_BUTTONRELEASE:
+ {
+ ButtonEvent *button = (ButtonEvent *)&event;
+
+ button->x += video.screen_xoffset;
+ button->y += video.screen_yoffset;
+
+ x = button->x * overlay.grid_xsize / video.screen_width;
+ y = button->y * overlay.grid_ysize / video.screen_height;
+
+ if (button->type == EVENT_BUTTONPRESS)
+ {
+ button_status = button->button;
+
+ grid_button_draw =
+ (overlay.grid_button[x][y] != grid_button[step_nr] ?
+ grid_button[step_nr] : CHAR_GRID_BUTTON_NONE);
+
+ set_grid_button = TRUE;
+ }
+ else
+ {
+ button_status = MB_RELEASED;
+ }
+ }
+ break;
+
+ case EVENT_MOTIONNOTIFY:
+ {
+ MotionEvent *motion = (MotionEvent *)&event;
+
+ motion->x += video.screen_xoffset;
+ motion->y += video.screen_yoffset;
+
+ x = motion->x * overlay.grid_xsize / video.screen_width;
+ y = motion->y * overlay.grid_ysize / video.screen_height;
+
+ set_grid_button = TRUE;
+ }
+ break;
+
+#if defined(TARGET_SDL2)
+ case SDL_WINDOWEVENT:
+ HandleWindowEvent((WindowEvent *) &event);
+
+ // check if device has been rotated
+ if (nr != GRID_ACTIVE_NR())
+ {
+ nr = GRID_ACTIVE_NR();
+
+ for (x = 0; x < MAX_GRID_XSIZE; x++)
+ for (y = 0; y < MAX_GRID_YSIZE; y++)
+ grid_button_old[x][y] = grid_button_tmp[x][y] =
+ overlay.grid_button[x][y];
+ }
+
+ break;
+
+ case SDL_APP_WILLENTERBACKGROUND:
+ case SDL_APP_DIDENTERBACKGROUND:
+ case SDL_APP_WILLENTERFOREGROUND:
+ case SDL_APP_DIDENTERFOREGROUND:
+ HandlePauseResumeEvent((PauseResumeEvent *) &event);
+ break;
+#endif
+
+ default:
+ HandleOtherEvents(&event);
+ break;
+ }
+
+ if (set_grid_button)
+ {
+ overlay.grid_button[x][y] =
+ (grid_button_draw != CHAR_GRID_BUTTON_NONE ? grid_button_draw :
+ grid_button_tmp[x][y] == grid_button[step_nr] ? CHAR_GRID_BUTTON_NONE :
+ grid_button_tmp[x][y]);
+
+ set_grid_button = FALSE;
+ }
+ }
+
+ BackToFront();
+ }
+
+ for (x = 0; x < MAX_GRID_XSIZE; x++)
+ for (y = 0; y < MAX_GRID_YSIZE; y++)
+ setup.touch.grid_button[nr][x][y] = overlay.grid_button[x][y];
+
+ overlay.grid_button_highlight = CHAR_GRID_BUTTON_NONE;
+
+ SetOverlayShowGrid(FALSE);
+
+ return success;
+}
+
+void ConfigureVirtualButtons(void)
+{
+ boolean success = ConfigureVirtualButtonsMain();
+
+ if (success)
+ {
+ int font_nr = FONT_TITLE_1;
+ 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;
+
+ ResetDelayCounter(&wait_frame_delay);
+
+ ClearField();
+
+ DrawTextSCentered(ypos1, font_nr, "Virtual buttons");
+ DrawTextSCentered(ypos2, font_nr, "configured!");
+
+ while (!DelayReached(&wait_frame_delay, wait_frame_delay_value))
+ BackToFront();
+
+ ClearEventQueue();
+ }
+}
+
+void DrawSetupScreen(void)
+{
+ if (setup_mode == SETUP_MODE_INPUT)
+ DrawSetupScreen_Input();
+ else if (setup_mode == SETUP_MODE_CHOOSE_GAME_SPEED)
+ DrawChooseTree(&game_speed_current);
+ else if (setup_mode == SETUP_MODE_CHOOSE_SCROLL_DELAY)
+ DrawChooseTree(&scroll_delay_current);
+ else if (setup_mode == SETUP_MODE_CHOOSE_SNAPSHOT_MODE)
+ DrawChooseTree(&snapshot_mode_current);
+ else if (setup_mode == SETUP_MODE_CHOOSE_WINDOW_SIZE)
+ 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_VSYNC)
+ DrawChooseTree(&vsync_mode_current);
+ else if (setup_mode == SETUP_MODE_CHOOSE_GRAPHICS)
+ DrawChooseTree(&artwork.gfx_current);
else if (setup_mode == SETUP_MODE_CHOOSE_SOUNDS)
DrawChooseTree(&artwork.snd_current);
else if (setup_mode == SETUP_MODE_CHOOSE_MUSIC)
DrawChooseTree(&move_distance_current);
else if (setup_mode == SETUP_MODE_CHOOSE_DROP_DISTANCE)
DrawChooseTree(&drop_distance_current);
+ else if (setup_mode == SETUP_MODE_CHOOSE_TRANSPARENCY)
+ DrawChooseTree(&transparency_current);
+ else if (setup_mode == SETUP_MODE_CHOOSE_GRID_XSIZE_0)
+ DrawChooseTree(&grid_size_current[0][0]);
+ else if (setup_mode == SETUP_MODE_CHOOSE_GRID_YSIZE_0)
+ DrawChooseTree(&grid_size_current[0][1]);
+ else if (setup_mode == SETUP_MODE_CHOOSE_GRID_XSIZE_1)
+ DrawChooseTree(&grid_size_current[1][0]);
+ else if (setup_mode == SETUP_MODE_CHOOSE_GRID_YSIZE_1)
+ DrawChooseTree(&grid_size_current[1][1]);
else
DrawSetupScreen_Generic();
PlayMenuSoundsAndMusic();
}
-void RedrawSetupScreenAfterFullscreenToggle()
+void RedrawSetupScreenAfterFullscreenToggle(void)
{
if (setup_mode == SETUP_MODE_GRAPHICS ||
setup_mode == SETUP_MODE_CHOOSE_WINDOW_SIZE)
}
}
+void RedrawSetupScreenAfterScreenRotation(int nr)
+{
+ int x, y;
+
+ if (setup_mode == SETUP_MODE_TOUCH)
+ {
+ // update virtual button settings (depending on screen orientation)
+ DrawSetupScreen();
+ }
+ else if (setup_mode == SETUP_MODE_CONFIG_VIRT_BUTTONS)
+ {
+ // save already configured virtual buttons
+ for (x = 0; x < MAX_GRID_XSIZE; x++)
+ for (y = 0; y < MAX_GRID_YSIZE; y++)
+ setup.touch.grid_button[nr][x][y] = overlay.grid_button[x][y];
+ }
+}
+
void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
{
if (setup_mode == SETUP_MODE_INPUT)
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_VSYNC)
+ HandleChooseTree(mx, my, dx, dy, button, &vsync_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)
HandleChooseTree(mx, my, dx, dy, button, &move_distance_current);
else if (setup_mode == SETUP_MODE_CHOOSE_DROP_DISTANCE)
HandleChooseTree(mx, my, dx, dy, button, &drop_distance_current);
+ else if (setup_mode == SETUP_MODE_CHOOSE_TRANSPARENCY)
+ HandleChooseTree(mx, my, dx, dy, button, &transparency_current);
+ else if (setup_mode == SETUP_MODE_CHOOSE_GRID_XSIZE_0)
+ HandleChooseTree(mx, my, dx, dy, button, &grid_size_current[0][0]);
+ else if (setup_mode == SETUP_MODE_CHOOSE_GRID_YSIZE_0)
+ HandleChooseTree(mx, my, dx, dy, button, &grid_size_current[0][1]);
+ else if (setup_mode == SETUP_MODE_CHOOSE_GRID_XSIZE_1)
+ HandleChooseTree(mx, my, dx, dy, button, &grid_size_current[1][0]);
+ else if (setup_mode == SETUP_MODE_CHOOSE_GRID_YSIZE_1)
+ HandleChooseTree(mx, my, dx, dy, button, &grid_size_current[1][1]);
else
HandleSetupScreen_Generic(mx, my, dx, dy, button);
}
-void HandleGameActions()
+void HandleGameActions(void)
{
+ if (setup.ask_on_game_over)
+ CheckGameOver();
+
+ if (game.restart_game_message != NULL)
+ {
+ RequestRestartGame(game.restart_game_message);
+
+ return;
+ }
+
if (game_status != GAME_MODE_PLAYING)
return;
*y = mSY + TILEY * MENU_SCREEN_START_YPOS;
break;
+ case SCREEN_CTRL_ID_INSERT_SOLUTION:
+ *x = mSX + GDI_ACTIVE_POS(menu.main.button.insert_solution.x);
+ *y = mSY + GDI_ACTIVE_POS(menu.main.button.insert_solution.y);
+ break;
+
+ case SCREEN_CTRL_ID_PLAY_SOLUTION:
+ *x = mSX + GDI_ACTIVE_POS(menu.main.button.play_solution.x);
+ *y = mSY + GDI_ACTIVE_POS(menu.main.button.play_solution.y);
+ break;
+
default:
Error(ERR_EXIT, "unknown gadget ID %d", gadget_id);
}
SCREEN_MASK_INPUT,
"next player"
},
+ {
+ IMG_MENU_BUTTON_INSERT_SOLUTION, IMG_MENU_BUTTON_INSERT_SOLUTION_ACTIVE,
+ getScreenMenuButtonPos,
+ SCREEN_CTRL_ID_INSERT_SOLUTION,
+ SCREEN_MASK_MAIN_HAS_SOLUTION,
+ "insert solution tape"
+ },
+ {
+ IMG_MENU_BUTTON_PLAY_SOLUTION, IMG_MENU_BUTTON_PLAY_SOLUTION_ACTIVE,
+ getScreenMenuButtonPos,
+ SCREEN_CTRL_ID_PLAY_SOLUTION,
+ SCREEN_MASK_MAIN_HAS_SOLUTION,
+ "play solution tape"
+ },
};
static struct
}
};
-static void CreateScreenMenubuttons()
+static struct
+{
+ int graphic;
+ int gadget_id;
+ int x, y;
+ int size;
+ char *value;
+ char *infotext;
+} textinput_info[NUM_SCREEN_TEXTINPUT] =
+{
+ {
+ IMG_SETUP_INPUT_TEXT,
+ SCREEN_CTRL_ID_NETWORK_SERVER,
+ -1, -1, /* these values are not constant, but can change at runtime */
+ MAX_SETUP_TEXT_INPUT_LEN,
+ network_server_hostname,
+ "Network Server Hostname / IP"
+ },
+};
+
+static void CreateScreenMenubuttons(void)
{
struct GadgetInfo *gi;
unsigned int event_mask;
int gd_x1, gd_x2, gd_y1, gd_y2;
int id = menubutton_info[i].gadget_id;
- event_mask = GD_EVENT_PRESSED | GD_EVENT_REPEATED;
+ if (menubutton_info[i].screen_mask == SCREEN_MASK_MAIN_HAS_SOLUTION)
+ event_mask = GD_EVENT_RELEASED;
+ else
+ event_mask = GD_EVENT_PRESSED | GD_EVENT_REPEATED;
menubutton_info[i].get_gadget_position(&x, &y, id);
- width = SC_MENUBUTTON_XSIZE;
- height = SC_MENUBUTTON_YSIZE;
+ if (menubutton_info[i].screen_mask == SCREEN_MASK_MAIN_HAS_SOLUTION)
+ {
+ width = graphic_info[menubutton_info[i].gfx_pressed].width;
+ height = graphic_info[menubutton_info[i].gfx_pressed].height;
+ }
+ else
+ {
+ width = SC_MENUBUTTON_XSIZE;
+ height = SC_MENUBUTTON_YSIZE;
+ }
gfx_unpressed = menubutton_info[i].gfx_unpressed;
gfx_pressed = menubutton_info[i].gfx_pressed;
gi = CreateGadget(GDI_CUSTOM_ID, id,
GDI_CUSTOM_TYPE_ID, i,
+ GDI_IMAGE_ID, gfx_unpressed,
GDI_INFO_TEXT, menubutton_info[i].infotext,
GDI_X, x,
GDI_Y, y,
}
}
-static void CreateScreenScrollbuttons()
+static void CreateScreenScrollbuttons(void)
{
struct GadgetInfo *gi;
unsigned int event_mask;
gi = CreateGadget(GDI_CUSTOM_ID, id,
GDI_CUSTOM_TYPE_ID, i,
+ GDI_IMAGE_ID, gfx_unpressed,
GDI_INFO_TEXT, scrollbutton_info[i].infotext,
GDI_X, x,
GDI_Y, y,
}
}
-static void CreateScreenScrollbars()
+static void CreateScreenScrollbars(void)
{
int i;
gi = CreateGadget(GDI_CUSTOM_ID, id,
GDI_CUSTOM_TYPE_ID, i,
+ GDI_IMAGE_ID, gfx_unpressed,
GDI_INFO_TEXT, scrollbar_info[i].infotext,
GDI_X, x,
GDI_Y, y,
}
}
-void CreateScreenGadgets()
+static void CreateScreenTextInputGadgets(void)
+{
+ int i;
+
+ for (i = 0; i < NUM_SCREEN_TEXTINPUT; i++)
+ {
+ int graphic = textinput_info[i].graphic;
+ struct GraphicInfo *gd = &graphic_info[graphic];
+ int gd_x1 = gd->src_x;
+ int gd_y1 = gd->src_y;
+ int gd_x2 = gd->src_x + gd->active_xoffset;
+ int gd_y2 = gd->src_y + gd->active_yoffset;
+ struct GadgetInfo *gi;
+ unsigned int event_mask;
+ int id = textinput_info[i].gadget_id;
+ int x = textinput_info[i].x;
+ int y = textinput_info[i].y;
+
+ event_mask = GD_EVENT_TEXT_RETURN | GD_EVENT_TEXT_LEAVING;
+
+ gi = CreateGadget(GDI_CUSTOM_ID, id,
+ GDI_CUSTOM_TYPE_ID, i,
+ GDI_INFO_TEXT, textinput_info[i].infotext,
+ GDI_X, SX + x,
+ GDI_Y, SY + y,
+ GDI_TYPE, GD_TYPE_TEXT_INPUT_ALPHANUMERIC,
+ GDI_TEXT_VALUE, textinput_info[i].value,
+ GDI_TEXT_SIZE, textinput_info[i].size,
+ GDI_TEXT_FONT, getSetupValueFont(TYPE_STRING, NULL),
+ GDI_TEXT_FONT_ACTIVE, FONT_TEXT_1,
+ GDI_DESIGN_UNPRESSED, gd->bitmap, gd_x1, gd_y1,
+ GDI_DESIGN_PRESSED, gd->bitmap, gd_x2, gd_y2,
+ GDI_BORDER_SIZE, gd->border_size, gd->border_size,
+ GDI_DESIGN_WIDTH, gd->width,
+ GDI_EVENT_MASK, event_mask,
+ GDI_CALLBACK_ACTION, HandleScreenGadgets,
+ GDI_CALLBACK_ACTION_ALWAYS, TRUE,
+ GDI_END);
+
+ if (gi == NULL)
+ Error(ERR_EXIT, "cannot create gadget");
+
+ screen_gadget[id] = gi;
+ }
+}
+
+void CreateScreenGadgets(void)
{
CreateScreenMenubuttons();
CreateScreenScrollbuttons();
CreateScreenScrollbars();
+
+ CreateScreenTextInputGadgets();
}
-void FreeScreenGadgets()
+void FreeScreenGadgets(void)
{
int i;
MapGadget(screen_gadget[menubutton_info[i].gadget_id]);
}
+static void UnmapScreenMenuGadgets(int screen_mask)
+{
+ int i;
+
+ for (i = 0; i < NUM_SCREEN_MENUBUTTONS; i++)
+ {
+ if (screen_mask & menubutton_info[i].screen_mask)
+ {
+ UnmapGadget(screen_gadget[menubutton_info[i].gadget_id]);
+
+ if (screen_mask & SCREEN_MASK_MAIN_HAS_SOLUTION)
+ DrawBackground(screen_gadget[menubutton_info[i].gadget_id]->x,
+ screen_gadget[menubutton_info[i].gadget_id]->y,
+ screen_gadget[menubutton_info[i].gadget_id]->width,
+ screen_gadget[menubutton_info[i].gadget_id]->height);
+ }
+ }
+}
+
+void UpdateScreenMenuGadgets(int screen_mask, boolean map_gadgets)
+{
+ if (map_gadgets)
+ MapScreenMenuGadgets(screen_mask);
+ else
+ UnmapScreenMenuGadgets(screen_mask);
+}
+
void MapScreenGadgets(int num_entries)
{
int i;
{
int id = gi->custom_id;
int button = gi->event.button;
- int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
+ int step = (button == MB_LEFTBUTTON ? 1 :
+ button == MB_MIDDLEBUTTON ? 5 :
+ button == MB_RIGHTBUTTON ? 10 : 1);
switch (id)
{
HandleSetupScreen_Input_Player(step, +1);
break;
+ case SCREEN_CTRL_ID_INSERT_SOLUTION:
+ InsertSolutionTape();
+ break;
+
+ case SCREEN_CTRL_ID_PLAY_SOLUTION:
+ PlaySolutionTape();
+ break;
+
case SCREEN_CTRL_ID_SCROLL_UP:
if (game_status == GAME_MODE_LEVELS)
HandleChooseLevelSet(0,0, 0, -1 * SCROLL_LINE, MB_MENU_MARK);
HandleInfoScreen(0,0, 999,gi->event.item_position,MB_MENU_INITIALIZE);
break;
+ case SCREEN_CTRL_ID_NETWORK_SERVER:
+ {
+ if (!strEqual(gi->textinput.value, ""))
+ {
+ setString(&setup.network_server_hostname, gi->textinput.value);
+
+ network.server_host = setup.network_server_hostname;
+ }
+ else
+ {
+ setString(&setup.network_server_hostname, STR_NETWORK_AUTO_DETECT);
+
+ network.server_host = NULL;
+ }
+
+ if (strEqual(network.server_host, STR_NETWORK_AUTO_DETECT))
+ network.server_host = NULL;
+
+ execSetupGame_setNetworkServerText();
+
+ DrawSetupScreen();
+
+ break;
+ }
+
default:
break;
}
}
+
+void DumpScreenIdentifiers(void)
+{
+ int i;
+
+ Print("Active screen elements on current screen:\n");
+
+ for (i = 0; main_controls[i].nr != -1; i++)
+ {
+ struct MainControlInfo *mci = &main_controls[i];
+
+ if (mci->button_graphic != -1)
+ {
+ char *token = getTokenFromImageID(mci->button_graphic);
+
+ Print("- '%s'\n", token);
+ }
+ }
+
+ Print("Done.\n");
+}
+
+boolean DoScreenAction(int image_id)
+{
+ int i;
+
+ if (game_status != GAME_MODE_MAIN)
+ return FALSE;
+
+ for (i = 0; main_controls[i].nr != -1; i++)
+ {
+ struct MainControlInfo *mci = &main_controls[i];
+ struct MenuPosInfo *pos = mci->pos_button;
+
+ if (mci->button_graphic == image_id)
+ {
+ int x = mSX + pos->x;
+ int y = mSY + pos->y;
+
+ HandleMainMenu(x, y, 0, 0, MB_MENU_CHOICE);
+
+ return TRUE;
+ }
+ }
+
+ return FALSE;
+}
projects / rocksndiamonds.git / blobdiff