projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e24c252
)
changed setting font for player name after typing
author
Holger Schemel
<info@artsoft.org>
Mon, 19 Oct 2020 21:10:58 +0000
(23:10 +0200)
committer
Holger Schemel
<info@artsoft.org>
Sun, 13 Dec 2020 23:57:58 +0000
(
00:57
+0100)
src/screens.c
patch
|
blob
|
history
diff --git
a/src/screens.c
b/src/screens.c
index c62ffec9c533d9ca8a8508990b772a46d3880ed3..5bbe467ef211387f4651ea1647b7b05ea69fbd02 100644
(file)
--- a/
src/screens.c
+++ b/
src/screens.c
@@
-4056,7
+4056,8
@@
static void getTypeNameValues(char *name, struct TextPosInfo *pos, int *xpos)
*xpos = strlen(name);
}
*xpos = strlen(name);
}
-static void setTypeNameValues(char *name, int *font, boolean success)
+static void setTypeNameValues(char *name, struct TextPosInfo *pos,
+ boolean success)
{
TreeInfo *node = type_name_node;
{
TreeInfo *node = type_name_node;
@@
-4074,7
+4075,7
@@
static void setTypeNameValues(char *name, int *font, boolean success)
if (success)
node->color = (strEqual(name, EMPTY_PLAYER_NAME) ? FC_BLUE : FC_RED);
if (success)
node->color = (strEqual(name, EMPTY_PLAYER_NAME) ? FC_BLUE : FC_RED);
-
*
font = FONT_TEXT_1 + node->color;
+
pos->
font = FONT_TEXT_1 + node->color;
}
if (!success)
}
if (!success)
@@
-4162,13
+4163,13
@@
static void HandleTypeNameExt(boolean initialize, Key key)
}
else if (key == KSYM_Return)
{
}
else if (key == KSYM_Return)
{
- setTypeNameValues(name,
&font_nr
, TRUE);
+ setTypeNameValues(name,
pos
, TRUE);
is_active = FALSE;
}
else if (key == KSYM_Escape)
{
is_active = FALSE;
}
else if (key == KSYM_Escape)
{
- setTypeNameValues(name,
&font_nr
, FALSE);
+ setTypeNameValues(name,
pos
, FALSE);
is_active = FALSE;
}
is_active = FALSE;
}
@@
-4188,7
+4189,7
@@
static void HandleTypeNameExt(boolean initialize, Key key)
pos->width = strlen(name) * font_width;
sx = mSX + ALIGNED_TEXT_XPOS(pos);
pos->width = strlen(name) * font_width;
sx = mSX + ALIGNED_TEXT_XPOS(pos);
- DrawText(sx, sy, name,
font_nr
);
+ DrawText(sx, sy, name,
pos->font
);
StopTextInput();
}
StopTextInput();
}