/* main menu display and control definitions */
-#define MAIN_CONTROL_NAME 0
-#define MAIN_CONTROL_LEVELS 1
-#define MAIN_CONTROL_SCORES 2
-#define MAIN_CONTROL_EDITOR 3
-#define MAIN_CONTROL_INFO 4
-#define MAIN_CONTROL_GAME 5
-#define MAIN_CONTROL_SETUP 6
-#define MAIN_CONTROL_QUIT 7
-#define MAIN_CONTROL_PREV_LEVEL 8
-#define MAIN_CONTROL_NEXT_LEVEL 9
-#define MAIN_CONTROL_CURRENT_LEVEL 10
-#define MAIN_CONTROL_FIRST_LEVEL 11
-#define MAIN_CONTROL_LAST_LEVEL 12
-#define MAIN_CONTROL_LEVEL_INFO_1 13
-#define MAIN_CONTROL_LEVEL_INFO_2 14
-#define MAIN_CONTROL_TITLE_1 15
-#define MAIN_CONTROL_TITLE_2 16
-#define MAIN_CONTROL_TITLE_3 17
-
-static char main_text_name[10];
-static char main_text_current_level[10];
-static char main_text_first_level[10];
-static char main_text_last_level[10];
-static char main_input_name[MAX_PLAYER_NAME_LEN + 1];
+#define MAIN_CONTROL_NAME 0
+#define MAIN_CONTROL_LEVELS 1
+#define MAIN_CONTROL_SCORES 2
+#define MAIN_CONTROL_EDITOR 3
+#define MAIN_CONTROL_INFO 4
+#define MAIN_CONTROL_GAME 5
+#define MAIN_CONTROL_SETUP 6
+#define MAIN_CONTROL_QUIT 7
+#define MAIN_CONTROL_PREV_LEVEL 8
+#define MAIN_CONTROL_NEXT_LEVEL 9
+#define MAIN_CONTROL_FIRST_LEVEL 10
+#define MAIN_CONTROL_LAST_LEVEL 11
+#define MAIN_CONTROL_LEVEL_NUMBER 12
+#define MAIN_CONTROL_LEVEL_INFO_1 13
+#define MAIN_CONTROL_LEVEL_INFO_2 14
+#define MAIN_CONTROL_LEVEL_NAME 15
+#define MAIN_CONTROL_LEVEL_AUTHOR 16
+#define MAIN_CONTROL_LEVEL_YEAR 17
+#define MAIN_CONTROL_LEVEL_IMPORTED_FROM 18
+#define MAIN_CONTROL_LEVEL_IMPORTED_BY 19
+#define MAIN_CONTROL_LEVEL_TESTED_BY 20
+#define MAIN_CONTROL_TITLE_1 21
+#define MAIN_CONTROL_TITLE_2 22
+#define MAIN_CONTROL_TITLE_3 23
+
+static char str_main_text_name[10];
+static char str_main_text_first_level[10];
+static char str_main_text_last_level[10];
+static char str_main_text_level_number[10];
+
+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;
+static char *main_text_level_number = str_main_text_level_number;
+static char *main_text_levels = "Levelset";
+static char *main_text_scores = "Hall Of Fame";
+static char *main_text_editor = "Level Creator";
+static char *main_text_info = "Info Screen";
+static char *main_text_game = "Start Game";
+static char *main_text_setup = "Setup";
+static char *main_text_quit = "Quit";
+static char *main_text_level_name = level.name;
+static char *main_text_level_author = level.author;
+static char *main_text_level_year = NULL;
+static char *main_text_level_imported_from = NULL;
+static char *main_text_level_imported_by = NULL;
+static char *main_text_level_tested_by = NULL;
+static char *main_text_title_1 = PROGRAM_TITLE_STRING;
+static char *main_text_title_2 = PROGRAM_COPYRIGHT_STRING;
+static char *main_text_title_3 = PROGRAM_GAME_BY_STRING;
struct MainControlInfo
{
int button_graphic;
struct TextPosInfo *pos_text;
- char *text;
- int font_text;
+ char **text;
- struct MenuPosInfo *pos_input;
- char *input;
- int font_input;
+ struct TextPosInfo *pos_input;
+ char **input;
};
static struct MainControlInfo main_controls[] =
{
MAIN_CONTROL_NAME,
&menu.main.button.name, IMG_MENU_BUTTON,
- &menu.main.text.name, main_text_name, FONT_MENU_1,
- &menu.main.input.name, main_input_name, FONT_INPUT_1,
+ &menu.main.text.name, &main_text_name,
+ &menu.main.input.name, &setup.player_name,
},
{
MAIN_CONTROL_LEVELS,
&menu.main.button.levels, IMG_MENU_BUTTON_ENTER_MENU,
- &menu.main.text.levels, "Levelset", FONT_MENU_1,
- NULL, NULL, -1,
+ &menu.main.text.levels, &main_text_levels,
+ NULL, NULL,
},
{
MAIN_CONTROL_SCORES,
&menu.main.button.scores, IMG_MENU_BUTTON,
- &menu.main.text.scores, "Hall Of Fame", FONT_MENU_1,
- NULL, NULL, -1,
+ &menu.main.text.scores, &main_text_scores,
+ NULL, NULL,
},
{
MAIN_CONTROL_EDITOR,
&menu.main.button.editor, IMG_MENU_BUTTON,
- &menu.main.text.editor, "Level Creator", FONT_MENU_1,
- NULL, NULL, -1,
+ &menu.main.text.editor, &main_text_editor,
+ NULL, NULL,
},
{
MAIN_CONTROL_INFO,
&menu.main.button.info, IMG_MENU_BUTTON_ENTER_MENU,
- &menu.main.text.info, "Info Screen", FONT_MENU_1,
- NULL, NULL, -1,
+ &menu.main.text.info, &main_text_info,
+ NULL, NULL,
},
{
MAIN_CONTROL_GAME,
&menu.main.button.game, IMG_MENU_BUTTON,
- &menu.main.text.game, "Start Game", FONT_MENU_1,
- NULL, NULL, -1,
+ &menu.main.text.game, &main_text_game,
+ NULL, NULL,
},
{
MAIN_CONTROL_SETUP,
&menu.main.button.setup, IMG_MENU_BUTTON_ENTER_MENU,
- &menu.main.text.setup, "Setup", FONT_MENU_1,
- NULL, NULL, -1,
+ &menu.main.text.setup, &main_text_setup,
+ NULL, NULL,
},
{
MAIN_CONTROL_QUIT,
&menu.main.button.quit, IMG_MENU_BUTTON,
- &menu.main.text.quit, "Quit", FONT_MENU_1,
- NULL, NULL, -1,
+ &menu.main.text.quit, &main_text_quit,
+ NULL, NULL,
},
#if 0
/* (these two buttons are real gadgets) */
{
MAIN_CONTROL_PREV_LEVEL,
&menu.main.button.prev_level, IMG_MENU_BUTTON_PREV_LEVEL,
- NULL, NULL, -1,
- NULL, NULL, -1,
+ NULL, NULL,
+ NULL, NULL,
},
{
MAIN_CONTROL_NEXT_LEVEL,
&menu.main.button.next_level, IMG_MENU_BUTTON_NEXT_LEVEL,
- NULL, NULL, -1,
- NULL, NULL, -1,
+ NULL, NULL,
+ NULL, NULL,
},
#endif
{
- MAIN_CONTROL_CURRENT_LEVEL,
+ MAIN_CONTROL_FIRST_LEVEL,
NULL, -1,
- &menu.main.text.current_level, main_text_current_level,FONT_VALUE_1,
- NULL, NULL, -1,
+ &menu.main.text.first_level, &main_text_first_level,
+ NULL, NULL,
},
{
- MAIN_CONTROL_FIRST_LEVEL,
+ MAIN_CONTROL_LAST_LEVEL,
NULL, -1,
- &menu.main.text.first_level, main_text_first_level, FONT_TEXT_3,
- NULL, NULL, -1,
+ &menu.main.text.last_level, &main_text_last_level,
+ NULL, NULL,
},
{
- MAIN_CONTROL_LAST_LEVEL,
+ MAIN_CONTROL_LEVEL_NUMBER,
NULL, -1,
- &menu.main.text.last_level, main_text_last_level, FONT_TEXT_3,
- NULL, NULL, -1,
+ &menu.main.text.level_number, &main_text_level_number,
+ NULL, NULL,
},
{
MAIN_CONTROL_LEVEL_INFO_1,
NULL, -1,
- &menu.main.text.level_info_1, NULL, -1,
- NULL, NULL, -1,
+ &menu.main.text.level_info_1, NULL,
+ NULL, NULL,
},
{
MAIN_CONTROL_LEVEL_INFO_2,
NULL, -1,
- &menu.main.text.level_info_2, NULL, -1,
- NULL, NULL, -1,
+ &menu.main.text.level_info_2, NULL,
+ NULL, NULL,
+ },
+ {
+ MAIN_CONTROL_LEVEL_NAME,
+ NULL, -1,
+ &menu.main.text.level_name, &main_text_level_name,
+ NULL, NULL,
+ },
+ {
+ MAIN_CONTROL_LEVEL_AUTHOR,
+ NULL, -1,
+ &menu.main.text.level_author, &main_text_level_author,
+ NULL, NULL,
+ },
+ {
+ MAIN_CONTROL_LEVEL_YEAR,
+ NULL, -1,
+ &menu.main.text.level_year, &main_text_level_year,
+ NULL, NULL,
+ },
+ {
+ MAIN_CONTROL_LEVEL_IMPORTED_FROM,
+ NULL, -1,
+ &menu.main.text.level_imported_from, &main_text_level_imported_from,
+ NULL, NULL,
+ },
+ {
+ MAIN_CONTROL_LEVEL_IMPORTED_BY,
+ NULL, -1,
+ &menu.main.text.level_imported_by, &main_text_level_imported_by,
+ NULL, NULL,
+ },
+ {
+ MAIN_CONTROL_LEVEL_TESTED_BY,
+ NULL, -1,
+ &menu.main.text.level_tested_by, &main_text_level_tested_by,
+ NULL, NULL,
},
{
MAIN_CONTROL_TITLE_1,
NULL, -1,
- &menu.main.text.title_1, PROGRAM_TITLE_STRING, FONT_TITLE_1,
- NULL, NULL, -1,
+ &menu.main.text.title_1, &main_text_title_1,
+ NULL, NULL,
},
{
MAIN_CONTROL_TITLE_2,
NULL, -1,
- &menu.main.text.title_2, PROGRAM_COPYRIGHT_STRING, FONT_TITLE_2,
- NULL, NULL, -1,
+ &menu.main.text.title_2, &main_text_title_2,
+ NULL, NULL,
},
{
MAIN_CONTROL_TITLE_3,
NULL, -1,
- &menu.main.text.title_3, PROGRAM_GAME_BY_STRING, FONT_TITLE_2,
- NULL, NULL, -1,
+ &menu.main.text.title_3, &main_text_title_3,
+ NULL, NULL,
},
{
-1,
NULL, -1,
- NULL, NULL, -1,
- NULL, NULL, -1,
+ NULL, NULL,
+ NULL, NULL,
}
};
compare_result = (tci1->initial ? -1 : +1);
else if (tci1->sort_priority != tci2->sort_priority)
compare_result = tci1->sort_priority - tci2->sort_priority;
+ else if (tci1->is_image != tci2->is_image)
+ compare_result = (tci1->is_image ? -1 : +1);
else
compare_result = tci1->local_nr - tci2->local_nr;
compareTitleControlInfo);
}
+static boolean visibleMenuPos(struct MenuPosInfo *pos)
+{
+ return (pos != NULL && pos->x != -1 && pos->y != -1);
+}
+
+static boolean visibleTextPos(struct TextPosInfo *pos)
+{
+ return (pos != NULL && pos->x != -1 && pos->y != -1);
+}
+
static void InitializeMainControls()
{
boolean local_team_mode = (!options.network && setup.team_mode);
int i;
/* set main control text values to dynamically determined values */
- sprintf(main_text_name, "%s", local_team_mode ? "Team:" : "Name:");
- sprintf(main_text_current_level, "%s", int2str(level_nr, 3));
- sprintf(main_text_first_level, "%03d", leveldir_current->first_level);
- sprintf(main_text_last_level, "%03d", leveldir_current->last_level);
- sprintf(main_input_name, "%s", setup.player_name);
+ sprintf(main_text_name, "%s", local_team_mode ? "Team:" : "Name:");
+ sprintf(main_text_first_level, "%03d", leveldir_current->first_level);
+ sprintf(main_text_last_level, "%03d", leveldir_current->last_level);
+ sprintf(main_text_level_number, "%s", int2str(level_nr, 3));
+
+ main_text_level_year = leveldir_current->year;
+ main_text_level_imported_from = leveldir_current->imported_from;
+ main_text_level_imported_by = leveldir_current->imported_by;
+ main_text_level_tested_by = leveldir_current->tested_by;
/* set main control screen positions to dynamically determined values */
for (i = 0; main_controls[i].nr != -1; i++)
int nr = mci->nr;
struct MenuPosInfo *pos_button = mci->pos_button;
struct TextPosInfo *pos_text = mci->pos_text;
- struct MenuPosInfo *pos_input = mci->pos_input;
- char *text = mci->text;
- char *input = mci->input;
+ struct TextPosInfo *pos_input = mci->pos_input;
+ char *text = (mci->text ? *mci->text : NULL);
+ char *input = (mci->input ? *mci->input : NULL);
int button_graphic = mci->button_graphic;
+#if 1
+ int font_text = (pos_text ? pos_text->font : -1);
+ int font_input = (pos_input ? pos_input->font : -1);
+#else
int font_text = mci->font_text;
int font_input = mci->font_input;
+#endif
int font_text_width = (font_text != -1 ? getFontWidth(font_text) : 0);
int font_text_height = (font_text != -1 ? getFontHeight(font_text) : 0);
#endif
}
- if (pos_button != NULL)
+ if (pos_button != NULL) /* (x/y may be -1/-1 here) */
{
if (pos_button->width == 0)
pos_button->width = button_width;
pos_button->height = button_height;
}
- if (pos_text != NULL)
+ if (pos_text != NULL) /* (x/y may be -1/-1 here) */
{
/* calculate width for non-clickable text -- needed for text alignment */
boolean calculate_text_width = (pos_button == NULL && text != NULL);
- if (pos_text->x == -1 && pos_button != NULL)
- pos_text->x = pos_button->x + pos_button->width;
- if (pos_text->y == -1 && pos_button != NULL)
- pos_text->y = pos_button->y;
+ if (visibleMenuPos(pos_button))
+ {
+ if (pos_text->x == -1)
+ pos_text->x = pos_button->x + pos_button->width;
+ if (pos_text->y == -1)
+ pos_text->y = pos_button->y;
+ }
if (pos_text->width == -1 || calculate_text_width)
pos_text->width = text_width;
pos_text->height = text_height;
}
- if (pos_input != NULL)
+ if (pos_input != NULL) /* (x/y may be -1/-1 here) */
{
- if (pos_input->x == -1 && pos_text != NULL)
- pos_input->x = pos_text->x + pos_text->width;
- if (pos_input->y == -1 && pos_text != NULL)
- pos_input->y = pos_text->y;
+ if (visibleTextPos(pos_text))
+ {
+ if (pos_input->x == -1)
+ pos_input->x = pos_text->x + pos_text->width;
+ if (pos_input->y == -1)
+ pos_input->y = pos_text->y;
+ }
if (pos_input->width == -1)
pos_input->width = input_width;
{
struct MenuPosInfo *pos_button = mci->pos_button;
struct TextPosInfo *pos_text = mci->pos_text;
- struct MenuPosInfo *pos_input = mci->pos_input;
- char *text = mci->text;
- char *input = mci->input;
+ struct TextPosInfo *pos_input = mci->pos_input;
+ char *text = (mci->text ? *mci->text : NULL);
+ char *input = (mci->input ? *mci->input : NULL);
int button_graphic = mci->button_graphic;
+#if 1
+ int font_text = (pos_text ? pos_text->font : -1);
+ int font_input = (pos_input ? pos_input->font : -1);
+#else
int font_text = mci->font_text;
int font_input = mci->font_input;
+#endif
if (active_text)
{
font_input = FONT_ACTIVE(font_input);
}
- if (pos_button != NULL)
+ if (visibleMenuPos(pos_button))
{
struct MenuPosInfo *pos = pos_button;
int x = mSX + pos->x;
DrawGraphicThruMaskExt(drawto, x, y, button_graphic, 0);
}
- if (pos_text != NULL && text != NULL)
+ if (visibleTextPos(pos_text) && text != NULL)
{
struct TextPosInfo *pos = pos_text;
- int x = mSX + ALIGNED_MENU_XPOS(pos);
- int y = mSY + ALIGNED_MENU_YPOS(pos);
+ int x = mSX + ALIGNED_TEXT_XPOS(pos);
+ int y = mSY + ALIGNED_TEXT_YPOS(pos);
+#if 1
+ /* (check why/if this is needed) */
DrawBackgroundForFont(x, y, pos->width, pos->height, font_text);
+#endif
DrawText(x, y, text, font_text);
}
- if (pos_input != NULL && input != NULL)
+ if (visibleTextPos(pos_input) && input != NULL)
{
- struct MenuPosInfo *pos = pos_input;
- int x = mSX + ALIGNED_MENU_XPOS(pos);
- int y = mSY + ALIGNED_MENU_YPOS(pos);
+ struct TextPosInfo *pos = pos_input;
+ int x = mSX + ALIGNED_TEXT_XPOS(pos);
+ int y = mSY + ALIGNED_TEXT_YPOS(pos);
+#if 1
+ /* (check why/if this is needed) */
DrawBackgroundForFont(x, y, pos->width, pos->height, font_input);
+#endif
DrawText(x, y, input, font_input);
}
}
if (rect == NULL)
return FALSE;
- int rect_x = ALIGNED_MENU_XPOS(rect);
- int rect_y = ALIGNED_MENU_YPOS(rect);
+ int rect_x = ALIGNED_TEXT_XPOS(rect);
+ int rect_y = ALIGNED_TEXT_YPOS(rect);
return (x >= rect_x && x < rect_x + rect->width &&
y >= rect_y && y < rect_y + rect->height);
if (rect == NULL)
return FALSE;
- int rect_x = ALIGNED_MENU_XPOS(rect);
- int rect_y = ALIGNED_MENU_YPOS(rect);
+ int rect_x = ALIGNED_TEXT_XPOS(rect);
+ int rect_y = ALIGNED_TEXT_YPOS(rect);
return (x >= rect_x && x < rect_x + rect->width &&
y >= rect_y && y < rect_y + rect->height);
void DrawTitleScreenMessage(int nr, boolean initial)
{
char *filename = getLevelSetTitleMessageFilename(nr, initial);
+ struct TitleMessageInfo *tmi = getTitleMessageInfo(nr, initial);
int font_nr = FONT_TEXT_1;
int font_width;
int font_height;
max_lines_per_screen = (WIN_YSIZE - pad_y) / font_height - 1;
DrawTextFile(sx, sy, filename, font_nr, max_chars_per_line, -1,
- max_lines_per_screen, -1, FALSE, FALSE, FALSE);
+ max_lines_per_screen, -1, tmi->autowrap, tmi->centered,
+ tmi->skip_comments);
game_status = last_game_status; /* restore current game status */
}
if (new_level_nr != old_level_nr)
{
- struct MainControlInfo *mci= getMainControlInfo(MAIN_CONTROL_CURRENT_LEVEL);
+ struct MainControlInfo *mci= getMainControlInfo(MAIN_CONTROL_LEVEL_NUMBER);
PlaySound(SND_MENU_ITEM_SELECTING);
#if 1
DrawText(mSX + mci->pos_text->x, mSY + mci->pos_text->y,
- int2str(level_nr, 3), mci->font_text);
+ int2str(level_nr, 3), mci->pos_text->font);
#else
DrawText(mSX + 11 * 32, mSY + 3 * 32, int2str(level_nr, 3), FONT_VALUE_1);
#endif
{
if (insideMenuPosRect(main_controls[i].pos_button, mx - mSX, my - mSY) ||
insideTextPosRect(main_controls[i].pos_text, mx - mSX, my - mSY) ||
- insideMenuPosRect(main_controls[i].pos_input, mx - mSX, my - mSY))
+ insideTextPosRect(main_controls[i].pos_input, mx - mSX, my - mSY))
{
pos = main_controls[i].nr;
ystart2 += 3 * ystep;
DrawTextF(xstart1, ystart2, font_header, "Driver");
DrawTextF(xstart2, ystart2, font_header, "Requested");
- DrawTextF(xstart3, ystart2, font_header, "Active");
+ DrawTextF(xstart3, ystart2, font_header, "Used");
SDL_VideoDriverName(driver_name, driver_name_len);
void DrawInfoScreen_LevelSet()
{
+ struct TitleMessageInfo *tmi = &readme;
int ystart1 = mSY - SY + 100;
int ystart2 = mSY - SY + 150;
int ybottom = mSY - SY + SYSIZE - 20;
char *filename = getLevelSetInfoFilename();
#if 1
+#if 1
+ int font_nr = tmi->font;
+#else
int font_nr = FONT_INFO_LEVELSET;
+#endif
#else
int font_nr = FONT_LEVEL_NUMBER;
#endif
+#if 0
int font_width = getFontWidth(font_nr);
int font_height = getFontHeight(font_nr);
+#endif
+#if 1
+#if 0
+ int sx = mSX + ALIGNED_TEXT_XPOS(tmi);
+ int sy = mSY + ALIGNED_TEXT_YPOS(tmi);
+#endif
+#if 0
+ int width = tmi->width;
+ int height = tmi->height;
+#endif
+#else
int pad_x = 32;
int pad_y = 150;
int sx = mSX + pad_x;
int sy = mSY + pad_y;
- int max_chars_per_line = (SXSIZE - 2 * pad_x) / font_width;
- int max_lines_per_screen = (SYSIZE - pad_y) / font_height - 1;
+ int width = SXSIZE - 2 * pad_x;
+ int height = SYSIZE - pad_y;
+#endif
+#if 1
+#if 0
+ int max_chars = tmi->chars;
+ int max_lines = tmi->lines;
+#endif
+#else
+ int max_chars_per_line = width / font_width;
+#if 1
+ int max_lines_per_screen = height / font_height;
+#else
+ int max_lines_per_screen = height / font_height - 1; /* minus footer line */
+#endif
+#endif
+
+ /* if chars set to "-1", automatically determine by text and font width */
+ if (tmi->chars == -1)
+ tmi->chars = tmi->width / getFontWidth(font_nr);
+ else
+ tmi->width = tmi->chars * getFontWidth(font_nr);
+
+ /* if lines set to "-1", automatically determine by text and font height */
+ if (tmi->lines == -1)
+ tmi->lines = tmi->height / getFontHeight(font_nr);
+ else
+ tmi->height = tmi->lines * getFontHeight(font_nr);
SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_LEVELSET);
"Press any key or button for info menu");
if (filename != NULL)
- DrawTextFile(sx, sy, filename, font_nr, max_chars_per_line, -1,
- max_lines_per_screen, -1, TRUE, FALSE, TRUE);
+ DrawTextFile(mSX + ALIGNED_TEXT_XPOS(tmi), mSY + ALIGNED_TEXT_YPOS(tmi),
+ filename, font_nr, tmi->chars, -1, tmi->lines, -1,
+ tmi->autowrap, tmi->centered, tmi->skip_comments);
else
DrawTextSCentered(ystart2, FONT_TEXT_2,
"No information for this level set.");
static char last_player_name[MAX_PLAYER_NAME_LEN + 1];
struct MainControlInfo *mci = getMainControlInfo(MAIN_CONTROL_NAME);
#if 1
- struct MenuPosInfo *pos = mci->pos_input;
- int startx = mSX + ALIGNED_MENU_XPOS(pos);
- int starty = mSY + ALIGNED_MENU_YPOS(pos);
+ struct TextPosInfo *pos = mci->pos_input;
+ int startx = mSX + ALIGNED_TEXT_XPOS(pos);
+ int starty = mSY + ALIGNED_TEXT_YPOS(pos);
#endif
#if 1
static int xpos = 0;
#else
static int xpos = 0, ypos = 2;
#endif
- int font_nr = mci->font_input;
+ int font_nr = pos->font;
int font_active_nr = FONT_ACTIVE(font_nr);
int font_width = getFontWidth(font_active_nr);
#if 1
#if 0
/* add one character width for added cursor character */
pos->width += font_width;
- startx = mSX + ALIGNED_MENU_XPOS(pos);
+ startx = mSX + ALIGNED_TEXT_XPOS(pos);
DrawText(startx, starty, setup.player_name, font_active_nr);
DrawText(startx + xpos * font_width, starty, "_", font_active_nr);
#if 0
/* add one character width for added name text character */
pos->width += font_width;
- startx = mSX + ALIGNED_MENU_XPOS(pos);
+ startx = mSX + ALIGNED_TEXT_XPOS(pos);
DrawText(startx, starty, setup.player_name, font_active_nr);
DrawText(startx + xpos * font_width, starty, "_", font_active_nr);
#if 0
/* remove one character width for removed name text character */
pos->width -= font_width;
- startx = mSX + ALIGNED_MENU_XPOS(pos);
+ startx = mSX + ALIGNED_TEXT_XPOS(pos);
DrawText(startx, starty, setup.player_name, font_active_nr);
DrawText(startx + xpos * font_width, starty, "_ ", font_active_nr);
#if 0
/* remove one character width for removed cursor text character */
pos->width -= font_width;
- startx = mSX + ALIGNED_MENU_XPOS(pos);
+ startx = mSX + ALIGNED_TEXT_XPOS(pos);
DrawText(startx, starty, setup.player_name, font_nr);
DrawText(startx + xpos * font_width, starty, " ", font_active_nr);
if (is_active)
{
pos->width = (strlen(setup.player_name) + 1) * font_width;
- startx = mSX + ALIGNED_MENU_XPOS(pos);
+ startx = mSX + ALIGNED_TEXT_XPOS(pos);
DrawText(startx, starty, setup.player_name, font_active_nr);
DrawText(startx + xpos * font_width, starty, "_", font_active_nr);
else
{
pos->width = strlen(setup.player_name) * font_width;
- startx = mSX + ALIGNED_MENU_XPOS(pos);
+ startx = mSX + ALIGNED_TEXT_XPOS(pos);
DrawText(startx, starty, setup.player_name, font_nr);
}
-
- sprintf(main_input_name, "%s", setup.player_name);
}
projects / rocksndiamonds.git / blobdiff