projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3208b9d
)
fixed centered screen position for keyboard/joystick configuration
author
Holger Schemel
<info@artsoft.org>
Thu, 19 Apr 2018 23:10:25 +0000
(
01:10
+0200)
committer
Holger Schemel
<info@artsoft.org>
Thu, 19 Apr 2018 23:10:25 +0000
(
01:10
+0200)
src/screens.c
patch
|
blob
|
history
diff --git
a/src/screens.c
b/src/screens.c
index 33df999e188698611fa0a938fe74939d8a4a8dcb..4f711f26ce3f584cb9ef610085f925f4bf292f31 100644
(file)
--- a/
src/screens.c
+++ b/
src/screens.c
@@
-6578,8
+6578,10
@@
void CustomizeKeyboard(int player_nr)
if (success)
{
if (success)
{
- int xpos = mSX - SX;
- int ypos = mSY - SY;
+ int font_nr = FONT_TITLE_1;
+ int font_height = getFontHeight(font_nr);
+ int ypos1 = SYSIZE / 2 - font_height * 2;
+ int ypos2 = SYSIZE / 2 - font_height * 1;
unsigned int wait_frame_delay = 0;
unsigned int wait_frame_delay_value = 2000;
unsigned int wait_frame_delay = 0;
unsigned int wait_frame_delay_value = 2000;
@@
-6587,8
+6589,8
@@
void CustomizeKeyboard(int player_nr)
ClearField();
ClearField();
- DrawTextS
(xpos + 16, ypos + 6 * 32, FONT_TITLE_1, " KEYBOARD
");
- DrawTextS
(xpos + 16, ypos + 7 * 32, FONT_TITLE_1, " IS CONFIGURED!
");
+ DrawTextS
Centered(ypos1, font_nr, "Keyboard
");
+ DrawTextS
Centered(ypos2, font_nr, "configured!
");
while (!DelayReached(&wait_frame_delay, wait_frame_delay_value))
BackToFront();
while (!DelayReached(&wait_frame_delay, wait_frame_delay_value))
BackToFront();
@@
-7006,11
+7008,14
@@
void ConfigureJoystick(int player_nr)
if (state != JOYSTICK_NOT_CONFIGURED)
{
boolean success = (state == JOYSTICK_CONFIGURED);
if (state != JOYSTICK_NOT_CONFIGURED)
{
boolean success = (state == JOYSTICK_CONFIGURED);
- char *message = (success ? " IS CONFIGURED! " : " NOT AVAILABLE! ");
+ char message1[MAX_OUTPUT_LINESIZE + 1];
+ char *message2 = (success ? "configured!" : "not available!");
char *device_name = setup.input[player_nr].joy.device_name;
int nr = getJoystickNrFromDeviceName(device_name) + 1;
char *device_name = setup.input[player_nr].joy.device_name;
int nr = getJoystickNrFromDeviceName(device_name) + 1;
- int xpos = mSX - SX;
- int ypos = mSY - SY;
+ int font_nr = FONT_TITLE_1;
+ int font_height = getFontHeight(font_nr);
+ int ypos1 = SYSIZE / 2 - font_height * 2;
+ int ypos2 = SYSIZE / 2 - font_height * 1;
unsigned int wait_frame_delay = 0;
unsigned int wait_frame_delay_value = 2000;
unsigned int wait_frame_delay = 0;
unsigned int wait_frame_delay_value = 2000;
@@
-7018,8
+7023,10
@@
void ConfigureJoystick(int player_nr)
ClearField();
ClearField();
- DrawTextF(xpos + 16, ypos + 6 * 32, FONT_TITLE_1, " JOYSTICK %d ", nr);
- DrawTextF(xpos + 16, ypos + 7 * 32, FONT_TITLE_1, message);
+ sprintf(message1, "Joystick %d", nr);
+
+ DrawTextSCentered(ypos1, font_nr, message1);
+ DrawTextSCentered(ypos2, font_nr, message2);
while (!DelayReached(&wait_frame_delay, wait_frame_delay_value))
BackToFront();
while (!DelayReached(&wait_frame_delay, wait_frame_delay_value))
BackToFront();