projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
version number set to 4.2.1.0
[rocksndiamonds.git]
/
src
/
screens.c
diff --git
a/src/screens.c
b/src/screens.c
index 4e41573bc7411db3c1633abba84063b132447aee..ee53e0bff80341528592124d4d84a82899bf5500 100644
(file)
--- a/
src/screens.c
+++ b/
src/screens.c
@@
-125,6
+125,7
@@
// other screen text constants
#define STR_CHOOSE_TREE_EDIT "Edit"
// 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
// for input setup functions
#define SETUPINPUT_SCREEN_POS_START 0
@@
-4020,6
+4021,11
@@
static TreeInfo *type_name_node = NULL;
static char type_name_last[MAX_PLAYER_NAME_LEN + 1] = { 0 };
static int type_name_nr = 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)
{
static void drawTypeNameText(char *name, struct TextPosInfo *pos,
boolean active)
{
@@
-4092,8
+4098,8
@@
static void setTypeNameValues_Name(char *name, struct TextPosInfo *pos)
setString(&node->name, name);
setString(&node->name_sorting, name);
setString(&node->name, name);
setString(&node->name_sorting, name);
- node->color =
(strEqual(name, EMPTY_PLAYER_NAME) ? FC_BLUE : FC_RED
);
- pos->font =
FONT_TEXT_1 + node->color
;
+ node->color =
getPlayerNameColor(name
);
+ pos->font =
MENU_CHOOSE_TREE_FONT(node->color)
;
}
}
}
}
@@
-4307,7
+4313,8
@@
static int getAlignXOffsetFromTreeInfo(TreeInfo *ti)
int num_entries = numTreeInfoInGroup(ti);
boolean scrollbar_needed = (num_entries > NUM_MENU_ENTRIES_ON_SCREEN);
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 button_width = SC_MENUBUTTON_XSIZE;
int scrollbar_xpos = SC_SCROLLBAR_XPOS + menu.scrollbar_xoffset;
int screen_width = (scrollbar_needed ? scrollbar_xpos : SXSIZE);
@@
-4327,7
+4334,8
@@
static int getAlignYOffsetFromTreeInfo(TreeInfo *ti)
int num_entries = numTreeInfoInGroup(ti);
int num_page_entries = MIN(num_entries, NUM_MENU_ENTRIES_ON_SCREEN);
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;
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;
@@
-4390,8
+4398,6
@@
static void drawChooseTreeList(int first_entry, int num_page_entries,
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);
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;
int i;
char *title_string = NULL;
int yoffset_sets = MENU_TITLE1_YPOS;
@@
-4409,6
+4415,12
@@
static void drawChooseTreeList(int first_entry, int num_page_entries,
{
TreeInfo *node, *node_first;
int entry_pos = first_entry + i;
{
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 xpos = MENU_SCREEN_START_XPOS;
int ypos = MENU_SCREEN_START_YPOS + i;
int startx = amSX + xpos * 32;
@@
-4419,13
+4431,10
@@
static void drawChooseTreeList(int first_entry, int num_page_entries,
int max_buffer_len = max_text_size / getFontWidth(font_nr);
char buffer[max_buffer_len + 1];
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';
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);
if (node->parent_link)
initCursor(i, IMG_MENU_BUTTON_LEAVE_MENU);
@@
-4870,18
+4879,13
@@
void DrawChoosePlayerName(void)
for (i = 0; i < MAX_PLAYER_NAMES; i++)
{
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;
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]);
snprintf(identifier, sizeof(identifier), "%d", value);
snprintf(name, sizeof(name), "%s", global.user_names[i]);