#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)
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 + MENU_SCREEN_INFO_XSTART + 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;
}
}
-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 success = FALSE;
/* read existing key bindings from player setup */
custom_key = setup.input[player_nr].key;
{
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)
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;
}
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();
}
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();
projects / rocksndiamonds.git / blobdiff