// other screen text constants
#define STR_CHOOSE_TREE_EDIT "Edit"
+#define MENU_CHOOSE_TREE_FONT(x) (FONT_TEXT_1 + (x))
// for input setup functions
#define SETUPINPUT_SCREEN_POS_START 0
static char type_name_last[MAX_PLAYER_NAME_LEN + 1] = { 0 };
static int type_name_nr = 0;
+static int getPlayerNameColor(char *name)
+{
+ return (strEqual(name, EMPTY_PLAYER_NAME) ? FC_BLUE : FC_RED);
+}
+
static void drawTypeNameText(char *name, struct TextPosInfo *pos,
boolean active)
{
char text[MAX_PLAYER_NAME_LEN + 2] = { 0 };
- int sx = mSX + ALIGNED_TEXT_XPOS(pos);
- int sy = mSY + ALIGNED_TEXT_YPOS(pos);
+ boolean multiple_users = (game_status == GAME_MODE_PSEUDO_TYPENAMES);
+ int sx = (multiple_users ? amSX + pos->x : mSX + ALIGNED_TEXT_XPOS(pos));
+ int sy = (multiple_users ? amSY + pos->y : mSY + ALIGNED_TEXT_YPOS(pos));
int font_nr = (active ? FONT_ACTIVE(pos->font) : pos->font);
int font_width = getFontWidth(font_nr);
sprintf(text, "%s%c", name, (active ? '_' : '\0'));
pos->width = strlen(text) * font_width;
- sx = mSX + ALIGNED_TEXT_XPOS(pos);
+ sx = (multiple_users ? amSX + pos->x : mSX + ALIGNED_TEXT_XPOS(pos));
DrawText(sx, sy, text, font_nr);
}
TreeInfo *node_first = getTreeInfoFirstGroupEntry(ti);
int xpos = MENU_SCREEN_START_XPOS;
int ypos = MENU_SCREEN_START_YPOS + ti->cl_cursor;
- int font_width = getFontWidth(pos->font);
type_name_node = getTreeInfoFromPos(node_first, entry_pos);
type_name_nr = entry_pos;
strcpy(name, type_name_node->name);
- pos->x = xpos * font_width;
- pos->y = ypos * font_width;
- pos->width = MAX_PLAYER_NAME_LEN * font_width;
+ pos->x = xpos * 32;
+ pos->y = ypos * 32;
+ pos->width = MAX_PLAYER_NAME_LEN * 32;
}
else
{
setString(&node->name, name);
setString(&node->name_sorting, name);
- node->color = (strEqual(name, EMPTY_PLAYER_NAME) ? FC_BLUE : FC_RED);
- pos->font = (node->color == FC_RED ? FONT_INPUT_1 : FONT_VALUE_OLD);
+ node->color = getPlayerNameColor(name);
+ pos->font = MENU_CHOOSE_TREE_FONT(node->color);
}
}
if (strEqual(name, ""))
strcpy(name, EMPTY_PLAYER_NAME);
+ setTypeNameValues_Name(name, pos);
+
// if player name not changed, no further action required
if (strEqual(name, type_name_last))
return;
- setTypeNameValues_Name(name, pos);
-
// redraw player name before (possibly) opening request dialogs
drawTypeNameText(name, pos, FALSE);
int num_entries = numTreeInfoInGroup(ti);
boolean scrollbar_needed = (num_entries > NUM_MENU_ENTRIES_ON_SCREEN);
- int text_width = max_text_size * getFontWidth(FONT_TEXT_1);
+ int font_nr = MENU_CHOOSE_TREE_FONT(FC_RED);
+ int text_width = max_text_size * getFontWidth(font_nr);
int button_width = SC_MENUBUTTON_XSIZE;
int scrollbar_xpos = SC_SCROLLBAR_XPOS + menu.scrollbar_xoffset;
int screen_width = (scrollbar_needed ? scrollbar_xpos : SXSIZE);
int num_entries = numTreeInfoInGroup(ti);
int num_page_entries = MIN(num_entries, NUM_MENU_ENTRIES_ON_SCREEN);
- int font_height = getFontHeight(FONT_TEXT_1);
+ int font_nr = MENU_CHOOSE_TREE_FONT(FC_RED);
+ int font_height = getFontHeight(font_nr);
int text_height = font_height * num_page_entries;
int page_height = font_height * NUM_MENU_ENTRIES_ON_SCREEN;
int align = menu.list_setup[SETUP_MODE_CHOOSE_OTHER].valign;
boolean scrollbar_needed = (num_entries > NUM_MENU_ENTRIES_ON_SCREEN);
int scrollbar_xpos = SC_SCROLLBAR_XPOS + menu.scrollbar_xoffset;
int screen_width = (scrollbar_needed ? scrollbar_xpos : SXSIZE);
- int font_nr = FONT_TEXT_1;
- int font_xoffset = getFontBitmapInfo(font_nr)->draw_xoffset;
int i;
char *title_string = NULL;
int yoffset_sets = MENU_TITLE1_YPOS;
{
TreeInfo *node, *node_first;
int entry_pos = first_entry + i;
+
+ node_first = getTreeInfoFirstGroupEntry(ti);
+ node = getTreeInfoFromPos(node_first, entry_pos);
+
+ int font_nr = MENU_CHOOSE_TREE_FONT(node->color);
+ int font_xoffset = getFontBitmapInfo(font_nr)->draw_xoffset;
int xpos = MENU_SCREEN_START_XPOS;
int ypos = MENU_SCREEN_START_YPOS + i;
int startx = amSX + xpos * 32;
int max_buffer_len = max_text_size / getFontWidth(font_nr);
char buffer[max_buffer_len + 1];
- node_first = getTreeInfoFirstGroupEntry(ti);
- node = getTreeInfoFromPos(node_first, entry_pos);
-
strncpy(buffer, node->name, max_buffer_len);
buffer[max_buffer_len] = '\0';
- DrawText(startx, starty, buffer, font_nr + node->color);
+ DrawText(startx, starty, buffer, font_nr);
if (node->parent_link)
initCursor(i, IMG_MENU_BUTTON_LEAVE_MENU);
for (i = 0; i < MAX_PLAYER_NAMES; i++)
{
- boolean team_mode = (!network.enabled && setup.team_mode);
- int tree_type = (team_mode ? TREE_TYPE_PLAYER_TEAM : TREE_TYPE_PLAYER_NAME);
- TreeInfo *ti = newTreeInfo_setDefaults(tree_type);
+ TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_PLAYER_NAME);
char identifier[32], name[MAX_PLAYER_NAME_LEN + 1];
int value = i;
ti->node_top = &player_name;
ti->sort_priority = 10000 + value;
- ti->color = FC_RED;
-
- if (strEqual(global.user_names[i], EMPTY_PLAYER_NAME))
- ti->color = FC_BLUE;
+ ti->color = getPlayerNameColor(global.user_names[i]);
snprintf(identifier, sizeof(identifier), "%d", value);
snprintf(name, sizeof(name), "%s", global.user_names[i]);
{ TYPE_SWITCH, &setup.forced_scroll_delay, "Scroll Delay:" },
{ TYPE_ECS_AGA, &setup.prefer_aga_graphics, "Amiga Graphics Chipset:" },
{ TYPE_SWITCH, &setup.prefer_lowpass_sounds,"Low-Pass Filter Sounds:" },
+ { TYPE_SWITCH, &setup.prefer_extra_panel_items,"Show Dynamite and Keys:" },
{ TYPE_EMPTY, NULL, "" },
{ TYPE_HEADLINE, NULL, "Supaplex" },
{ TYPE_SWITCH, &setup.sp_show_border_elements, "Border Elements:" },