projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7365879
)
renamed variables
author
Holger Schemel
<info@artsoft.org>
Mon, 19 Oct 2020 21:26:15 +0000
(23:26 +0200)
committer
Holger Schemel
<info@artsoft.org>
Sun, 13 Dec 2020 23:57:59 +0000
(
00:57
+0100)
src/screens.c
patch
|
blob
|
history
diff --git
a/src/screens.c
b/src/screens.c
index f859a632d65229720f6706c9d861e432ad02af54..a5f249eef9e806895625ce487f99ce4320bb820f 100644
(file)
--- a/
src/screens.c
+++ b/
src/screens.c
@@
-4076,11
+4076,11
@@
static void getTypeNameValues(char *name, struct TextPosInfo *pos, int *xpos)
}
static void setTypeNameValues(char *name, struct TextPosInfo *pos,
}
static void setTypeNameValues(char *name, struct TextPosInfo *pos,
- boolean
success
)
+ boolean
changed
)
{
TreeInfo *node = type_name_node;
{
TreeInfo *node = type_name_node;
- if (!
success
)
+ if (!
changed
)
strcpy(name, type_name_last);
if (strEqual(name, ""))
strcpy(name, type_name_last);
if (strEqual(name, ""))
@@
-4091,13
+4091,13
@@
static void setTypeNameValues(char *name, struct TextPosInfo *pos,
if (node == NULL) // should not happen
return;
if (node == NULL) // should not happen
return;
- if (
success
)
+ if (
changed
)
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 = (strEqual(name, EMPTY_PLAYER_NAME) ? FC_BLUE : FC_RED);
pos->font = (node->color == FC_RED ? FONT_INPUT_1 : FONT_VALUE_OLD);
}
- if (!
success
)
+ if (!
changed
)
return;
if (strEqual(name, type_name_last))
return;
if (strEqual(name, type_name_last))
@@
-4150,7
+4150,7
@@
static void HandleTypeNameExt(boolean initialize, Key key)
struct TextPosInfo *pos = &pos_name;
char key_char = getValidConfigValueChar(getCharFromKey(key));
boolean is_valid_key_char = (key_char != 0 && (key_char != ' ' || xpos > 0));
struct TextPosInfo *pos = &pos_name;
char key_char = getValidConfigValueChar(getCharFromKey(key));
boolean is_valid_key_char = (key_char != 0 && (key_char != ' ' || xpos > 0));
- boolean
is_
active = TRUE;
+ boolean active = TRUE;
if (initialize)
{
if (initialize)
{
@@
-4178,18
+4178,18
@@
static void HandleTypeNameExt(boolean initialize, Key key)
{
setTypeNameValues(name, pos, TRUE);
{
setTypeNameValues(name, pos, TRUE);
-
is_
active = FALSE;
+ active = FALSE;
}
else if (key == KSYM_Escape)
{
setTypeNameValues(name, pos, FALSE);
}
else if (key == KSYM_Escape)
{
setTypeNameValues(name, pos, FALSE);
-
is_
active = FALSE;
+ active = FALSE;
}
}
- drawTypeNameText(name, pos,
is_
active);
+ drawTypeNameText(name, pos, active);
- if (!
is_
active)
+ if (!active)
{
StopTextInput();
{
StopTextInput();