projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
55188fc
)
renamed some variables
author
Holger Schemel
<info@artsoft.org>
Sun, 18 Oct 2020 11:25:32 +0000
(13:25 +0200)
committer
Holger Schemel
<info@artsoft.org>
Sun, 13 Dec 2020 23:57:57 +0000
(
00:57
+0100)
src/screens.c
patch
|
blob
|
history
diff --git
a/src/screens.c
b/src/screens.c
index 95b56934b1ba724ec404442afd310387fdf2d829..2ec1e94155f3b52ad29b53f6d2dc8da49f5ecabb 100644
(file)
--- a/
src/screens.c
+++ b/
src/screens.c
@@
-3983,8
+3983,8
@@
static void HandleTypeNameExt(boolean initialize, Key key)
static char last_player_name[MAX_PLAYER_NAME_LEN + 1];
struct MainControlInfo *mci = getMainControlInfo(MAIN_CONTROL_NAME);
struct TextPosInfo *pos = mci->pos_input;
static char last_player_name[MAX_PLAYER_NAME_LEN + 1];
struct MainControlInfo *mci = getMainControlInfo(MAIN_CONTROL_NAME);
struct TextPosInfo *pos = mci->pos_input;
- int s
tart
x = mSX + ALIGNED_TEXT_XPOS(pos);
- int s
tart
y = mSY + ALIGNED_TEXT_YPOS(pos);
+ int sx = mSX + ALIGNED_TEXT_XPOS(pos);
+ int sy = mSY + ALIGNED_TEXT_YPOS(pos);
static int xpos = 0;
int font_nr = pos->font;
int font_active_nr = FONT_ACTIVE(font_nr);
static int xpos = 0;
int font_nr = pos->font;
int font_active_nr = FONT_ACTIVE(font_nr);
@@
-3993,7
+3993,7
@@
static void HandleTypeNameExt(boolean initialize, Key key)
boolean is_valid_key_char = (key_char != 0 && (key_char != ' ' || xpos > 0));
boolean is_active = TRUE;
boolean is_valid_key_char = (key_char != 0 && (key_char != ' ' || xpos > 0));
boolean is_active = TRUE;
- DrawBackgroundForFont(s
tartx,start
y, pos->width, pos->height, font_active_nr);
+ DrawBackgroundForFont(s
x, s
y, pos->width, pos->height, font_active_nr);
if (initialize)
{
if (initialize)
{
@@
-4001,7
+4001,7
@@
static void HandleTypeNameExt(boolean initialize, Key key)
xpos = strlen(setup.player_name);
xpos = strlen(setup.player_name);
- StartTextInput(s
tartx, start
y, pos->width, pos->height);
+ StartTextInput(s
x, s
y, pos->width, pos->height);
}
else if (is_valid_key_char && xpos < MAX_PLAYER_NAME_LEN)
{
}
else if (is_valid_key_char && xpos < MAX_PLAYER_NAME_LEN)
{
@@
-4036,17
+4036,17
@@
static void HandleTypeNameExt(boolean initialize, Key key)
if (is_active)
{
pos->width = (strlen(setup.player_name) + 1) * font_width;
if (is_active)
{
pos->width = (strlen(setup.player_name) + 1) * font_width;
- s
tart
x = mSX + ALIGNED_TEXT_XPOS(pos);
+ sx = mSX + ALIGNED_TEXT_XPOS(pos);
- DrawText(s
tartx, start
y, setup.player_name, font_active_nr);
- DrawText(s
tartx + xpos * font_width, start
y, "_", font_active_nr);
+ DrawText(s
x, s
y, setup.player_name, font_active_nr);
+ DrawText(s
x + xpos * font_width, s
y, "_", font_active_nr);
}
else
{
pos->width = strlen(setup.player_name) * font_width;
}
else
{
pos->width = strlen(setup.player_name) * font_width;
- s
tart
x = mSX + ALIGNED_TEXT_XPOS(pos);
+ sx = mSX + ALIGNED_TEXT_XPOS(pos);
- DrawText(s
tartx, start
y, setup.player_name, font_nr);
+ DrawText(s
x, s
y, setup.player_name, font_nr);
StopTextInput();
}
StopTextInput();
}