static char main_text_last_level[10];
static char main_input_name[MAX_PLAYER_NAME_LEN + 1];
-static struct
+struct MainControlInfo
{
int nr;
struct MenuPosInfo *pos_input;
char *input;
int font_input;
-}
-main_controls[] =
+};
+
+static struct MainControlInfo main_controls[] =
{
{
MAIN_CONTROL_NAME,
NULL, NULL, -1,
},
#if 0
+ /* (these two buttons are real gadgets) */
{
MAIN_CONTROL_PREV_LEVEL,
&menu.main.button.prev_level, IMG_MENU_BUTTON_PREV_LEVEL,
/* set main control screen positions to dynamically determined values */
for (i = 0; main_controls[i].nr != -1; i++)
{
- int nr = main_controls[i].nr;
- struct MenuPosInfo *pos_button = main_controls[i].pos_button;
- struct MenuPosInfo *pos_text = main_controls[i].pos_text;
- struct MenuPosInfo *pos_input = main_controls[i].pos_input;
- char *text = main_controls[i].text;
- char *input = main_controls[i].input;
- int button_graphic = main_controls[i].button_graphic;
- int font_text = main_controls[i].font_text;
- int font_input = main_controls[i].font_input;
+ struct MainControlInfo *mci = &main_controls[i];
+ int nr = mci->nr;
+ struct MenuPosInfo *pos_button = mci->pos_button;
+ struct MenuPosInfo *pos_text = mci->pos_text;
+ struct MenuPosInfo *pos_input = mci->pos_input;
+ char *text = mci->text;
+ char *input = mci->input;
+ int button_graphic = mci->button_graphic;
+ int font_text = mci->font_text;
+ int font_input = mci->font_input;
int font_text_width = (font_text != -1 ? getFontWidth(font_text) : 0);
int font_text_height = (font_text != -1 ? getFontHeight(font_text) : 0);
}
}
-static void DrawCursorAndText_Main(int pos, boolean active)
+static void DrawCursorAndText_Main(int nr, boolean active)
{
int i;
for (i = 0; main_controls[i].nr != -1; i++)
{
- if (main_controls[i].nr == pos || pos == -1)
+ struct MainControlInfo *mci = &main_controls[i];
+
+ if (mci->nr == nr || nr == -1)
{
- struct MenuPosInfo *pos_button = main_controls[i].pos_button;
- struct MenuPosInfo *pos_text = main_controls[i].pos_text;
- struct MenuPosInfo *pos_input = main_controls[i].pos_input;
- char *text = main_controls[i].text;
- char *input = main_controls[i].input;
- int button_graphic = main_controls[i].button_graphic;
- int font_text = main_controls[i].font_text;
- int font_input = main_controls[i].font_input;
+ struct MenuPosInfo *pos_button = mci->pos_button;
+ struct MenuPosInfo *pos_text = mci->pos_text;
+ struct MenuPosInfo *pos_input = mci->pos_input;
+ char *text = mci->text;
+ char *input = mci->input;
+ int button_graphic = mci->button_graphic;
+ int font_text = mci->font_text;
+ int font_input = mci->font_input;
if (active)
{
if (pos_button != NULL)
{
- int button_x = mSX + pos_button->x;
- int button_y = mSY + pos_button->y;
+ struct MenuPosInfo *pos = pos_button;
+ int x = mSX + pos->x;
+ int y = mSY + pos->y;
- DrawBackground(button_x,button_y, pos_button->width,pos_button->height);
- DrawGraphicThruMaskExt(drawto, button_x, button_y, button_graphic, 0);
+ DrawBackgroundForGraphic(x, y, pos->width, pos->height, button_graphic);
+ DrawGraphicThruMaskExt(drawto, x, y, button_graphic, 0);
}
if (pos_text != NULL && text != NULL)
{
- int text_x = mSX + ALIGNED_XPOS(pos_text->x, pos_text->width,
- pos_text->align);
- int text_y = mSY + pos_text->y;
+ struct MenuPosInfo *pos = pos_text;
+ int x = mSX + ALIGNED_XPOS(pos->x, pos->width, pos->align);
+ int y = mSY + pos->y;
- DrawBackground(text_x, text_y, pos_text->width, pos_text->height);
- DrawText(text_x, text_y, text, font_text);
+ DrawBackgroundForFont(x, y, pos->width, pos->height, font_text);
+ DrawText(x, y, text, font_text);
}
if (pos_input != NULL && input != NULL)
{
- int input_x = mSX + ALIGNED_XPOS(pos_input->x, pos_input->width,
- pos_input->align);
- int input_y = mSY + pos_input->y;
+ struct MenuPosInfo *pos = pos_input;
+ int x = mSX + ALIGNED_XPOS(pos->x, pos->width, pos->align);
+ int y = mSY + pos->y;
- DrawBackground(input_x, input_y, pos_input->width, pos_input->height);
- DrawText(input_x, input_y, input, font_input);
+ DrawBackgroundForFont(x, y, pos->width, pos->height, font_input);
+ DrawText(x, y, input, font_input);
}
}
}
}
+static struct MainControlInfo *getMainControlInfo(int nr)
+{
+ int i;
+
+ for (i = 0; main_controls[i].nr != -1; i++)
+ if (main_controls[i].nr == nr)
+ return &main_controls[i];
+
+ return NULL;
+}
+
static boolean insideMenuPosRect(struct MenuPosInfo *rect, int x, int y)
{
if (rect == NULL)
if (active)
graphic = BUTTON_GRAPHIC_ACTIVE(graphic);
- DrawBackground(x, y, TILEX, TILEY);
+ DrawBackgroundForGraphic(x, y, TILEX, TILEY, graphic);
DrawGraphicThruMaskExt(drawto, x, y, graphic, 0);
}
{
int graphic = getTitleScreenGraphic() + nr;
Bitmap *bitmap = graphic_info[graphic].bitmap;
+#if 1
+ int width = graphic_info[graphic].width;
+ int height = graphic_info[graphic].height;
+ int src_x = graphic_info[graphic].src_x;
+ int src_y = graphic_info[graphic].src_y;
+#else
int width = graphic_info[graphic].src_image_width;
int height = graphic_info[graphic].src_image_height;
int src_x = 0, src_y = 0;
+#endif
int dst_x, dst_y;
if (bitmap == NULL)
DrawInfoScreen_NotAvailable("Title screen information:",
"No title screen for this level set.");
+ title.auto_delay_final = -1;
+
return;
}
if (game_status == GAME_MODE_INFO &&
graphic_info[IMG_TITLESCREEN_1].bitmap == NULL)
{
+ FadeOut(REDRAW_FIELD);
+
info_mode = INFO_MODE_MAIN;
- DrawInfoScreen();
+ DrawAndFadeInInfoScreen(REDRAW_FIELD);
return;
}
if (new_level_nr != old_level_nr)
{
+ struct MainControlInfo *mci= getMainControlInfo(MAIN_CONTROL_CURRENT_LEVEL);
+
level_nr = new_level_nr;
+#if 1
+ DrawText(mSX + mci->pos_text->x, mSY + mci->pos_text->y,
+ int2str(level_nr, 3), mci->font_text);
+#else
DrawText(mSX + 11 * 32, mSY + 3 * 32, int2str(level_nr, 3), FONT_VALUE_1);
+#endif
LoadLevel(level_nr);
DrawPreviewLevel(TRUE);
void DrawInfoScreen_NotAvailable(char *text_title, char *text_error)
{
- int ystart = 150;
+ int ystart1 = 100;
+ int ystart2 = 150;
int ybottom = SYSIZE - 20;
SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_LEVELSET);
+ FadeOut(REDRAW_FIELD);
+
ClearWindow();
DrawHeadline();
- DrawTextSCentered(100, FONT_TEXT_1, text_title);
+ DrawTextSCentered(ystart1, FONT_TEXT_1, text_title);
+ DrawTextSCentered(ystart2, FONT_TEXT_2, text_error);
DrawTextSCentered(ybottom, FONT_TEXT_4,
"Press any key or button for info menu");
- DrawTextSCentered(ystart, FONT_TEXT_2, text_error);
+ FadeIn(REDRAW_FIELD);
}
void DrawInfoScreen_HelpAnim(int start, int max_anims, boolean init)
void HandleTypeName(int newxpos, Key key)
{
+ struct MainControlInfo *mci = getMainControlInfo(MAIN_CONTROL_NAME);
+#if 1
+ static int xpos = 0;
+#else
static int xpos = 0, ypos = 2;
- int font_width = getFontWidth(FONT_INPUT_1_ACTIVE);
+#endif
+ int font_nr = mci->font_input;
+ int font_active_nr = FONT_ACTIVE(font_nr);
+ int font_width = getFontWidth(font_active_nr);
+#if 1
+ int startx = mSX + mci->pos_input->x;
+ int starty = mSY + mci->pos_input->y;
+#else
int name_width = getFontWidth(FONT_MENU_1) * strlen("Name:");
int startx = mSX + 32 + name_width;
int starty = mSY + ypos * 32;
+#endif
if (newxpos)
{
xpos = newxpos;
- DrawText(startx, starty, setup.player_name, FONT_INPUT_1_ACTIVE);
- DrawText(startx + xpos * font_width, starty, "_", FONT_INPUT_1_ACTIVE);
+ DrawText(startx, starty, setup.player_name, font_active_nr);
+ DrawText(startx + xpos * font_width, starty, "_", font_active_nr);
return;
}
setup.player_name[xpos] = ascii;
setup.player_name[xpos + 1] = 0;
+
xpos++;
- DrawText(startx, starty, setup.player_name, FONT_INPUT_1_ACTIVE);
- DrawText(startx + xpos * font_width, starty, "_", FONT_INPUT_1_ACTIVE);
+ DrawText(startx, starty, setup.player_name, font_active_nr);
+ DrawText(startx + xpos * font_width, starty, "_", font_active_nr);
}
else if ((key == KSYM_Delete || key == KSYM_BackSpace) && xpos > 0)
{
xpos--;
+
setup.player_name[xpos] = 0;
- DrawText(startx + xpos * font_width, starty, "_ ", FONT_INPUT_1_ACTIVE);
+ DrawText(startx + xpos * font_width, starty, "_ ", font_active_nr);
}
else if (key == KSYM_Return && xpos > 0)
{
- DrawText(startx, starty, setup.player_name, FONT_INPUT_1);
- DrawText(startx + xpos * font_width, starty, " ", FONT_INPUT_1_ACTIVE);
+ DrawText(startx, starty, setup.player_name, font_nr);
+ DrawText(startx + xpos * font_width, starty, " ", font_active_nr);
SaveSetup();
+
game_status = GAME_MODE_MAIN;
}
}
/* force LEVELS font on artwork setup screen */
game_status = GAME_MODE_LEVELS;
+#if 1
+ /* clear tree list area, but not title or scrollbar */
+ DrawBackground(mSX, mSY + MENU_SCREEN_START_YPOS * 32,
+ SC_SCROLLBAR_XPOS + menu.scrollbar_xoffset,
+ NUM_MENU_ENTRIES_ON_SCREEN * 32);
+#else
/* clear tree list area, but not title or scrollbar */
DrawBackground(mSX, mSY + MENU_SCREEN_START_YPOS * 32,
SC_SCROLLBAR_XPOS + menu.scrollbar_xoffset,
MAX_MENU_ENTRIES_ON_SCREEN * 32);
+#endif
for (i = 0; i < num_page_entries; i++)
{
TreeInfo *node, *node_first;
int x, last_redraw_mask = redraw_mask;
int ypos = MENU_TITLE2_YPOS;
+ int font_nr = FONT_TITLE_2;
if (ti->type != TREE_TYPE_LEVEL_DIR)
return;
node_first = getTreeInfoFirstGroupEntry(ti);
node = getTreeInfoFromPos(node_first, entry_pos);
- DrawBackground(SX, SY + ypos, SXSIZE, getFontHeight(FONT_TITLE_2));
+ DrawBackgroundForFont(SX, SY + ypos, SXSIZE, getFontHeight(font_nr), font_nr);
if (node->parent_link)
- DrawTextFCentered(ypos, FONT_TITLE_2, "leave group \"%s\"",
+ DrawTextFCentered(ypos, font_nr, "leave group \"%s\"",
node->class_desc);
else if (node->level_group)
- DrawTextFCentered(ypos, FONT_TITLE_2, "enter group \"%s\"",
+ DrawTextFCentered(ypos, font_nr, "enter group \"%s\"",
node->class_desc);
else if (ti->type == TREE_TYPE_LEVEL_DIR)
- DrawTextFCentered(ypos, FONT_TITLE_2, "%3d levels (%s)",
+ DrawTextFCentered(ypos, font_nr, "%3d levels (%s)",
node->levels, node->class_desc);
/* let BackToFront() redraw only what is needed */
{
UnmapAllGadgets();
FadeSoundsAndMusic();
+
+ /* (this is needed when called from GameEnd() after winning a game) */
+ KeyboardAutoRepeatOn();
+ ActivateJoystick();
+
+ /* (this is needed when called from GameEnd() after winning a game) */
+ SetDrawDeactivationMask(REDRAW_NONE);
+ SetDrawBackgroundMask(REDRAW_FIELD);
+
CloseDoor(DOOR_CLOSE_2);
if (highlight_position < 0)
projects / rocksndiamonds.git / blobdiff