projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c2cd207
)
replaced some info screen positions with already defined symbolic names
author
Holger Schemel
<info@artsoft.org>
Sun, 25 Mar 2018 00:17:37 +0000
(
01:17
+0100)
committer
Holger Schemel
<info@artsoft.org>
Sun, 25 Mar 2018 00:17:37 +0000
(
01:17
+0100)
src/screens.c
patch
|
blob
|
history
diff --git
a/src/screens.c
b/src/screens.c
index e20f4deb67a8fe729b207733fdf6dfc5d83ad83b..f5b450e48f75aa73b1d19da9e6968208b0f2ee15 100644
(file)
--- a/
src/screens.c
+++ b/
src/screens.c
@@
-2600,9
+2600,9
@@
void DrawInfoScreen_NotAvailable(char *text_title, char *text_error)
int font_foot = MENU_INFO_FONT_FOOT;
int spacing_title = menu.headline1_spacing_info[info_mode];
int ystep_title = getMenuTextStep(spacing_title, font_title);
int font_foot = MENU_INFO_FONT_FOOT;
int spacing_title = menu.headline1_spacing_info[info_mode];
int ystep_title = getMenuTextStep(spacing_title, font_title);
- int ystart1 = mSY - SY +
100
;
+ int ystart1 = mSY - SY +
MENU_SCREEN_INFO_YSTART1
;
int ystart2 = ystart1 + ystep_title;
int ystart2 = ystart1 + ystep_title;
- int ybottom = mSY - SY +
SYSIZE - 20
;
+ int ybottom = mSY - SY +
MENU_SCREEN_INFO_YBOTTOM
;
SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO);
SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO);
@@
-2756,7
+2756,7
@@
void DrawInfoScreen_HelpText(int element, int action, int direction, int ypos)
int font_width = getFontWidth(font_nr);
int font_height = getFontHeight(font_nr);
int yoffset = (TILEX - 2 * font_height) / 2;
int font_width = getFontWidth(font_nr);
int font_height = getFontHeight(font_nr);
int yoffset = (TILEX - 2 * font_height) / 2;
- int xstart = mSX + M
INI_TILEX
+ TILEX + MINI_TILEX;
+ int xstart = mSX + M
ENU_SCREEN_INFO_XSTART
+ TILEX + MINI_TILEX;
int ystart = mSY + MENU_SCREEN_INFO_YSTART2 + yoffset;
int ystep = TILEY + 4;
int pad_x = xstart - SX;
int ystart = mSY + MENU_SCREEN_INFO_YSTART2 + yoffset;
int ystep = TILEY + 4;
int pad_x = xstart - SX;
@@
-2919,8
+2919,8
@@
void HandleInfoScreen_Music(int button)
int spacing_head = menu.headline2_spacing_info[info_mode];
int ystep_title = getMenuTextStep(spacing_title, font_title);
int ystep_head = getMenuTextStep(spacing_head, font_head);
int spacing_head = menu.headline2_spacing_info[info_mode];
int ystep_title = getMenuTextStep(spacing_title, font_title);
int ystep_head = getMenuTextStep(spacing_head, font_head);
- int ystart
= mSY - SY + 100
;
- int ybottom = mSY - SY +
SYSIZE - 20
;
+ int ystart
= mSY - SY + MENU_SCREEN_INFO_YSTART1
;
+ int ybottom = mSY - SY +
MENU_SCREEN_INFO_YBOTTOM
;
if (button == MB_MENU_INITIALIZE)
{
if (button == MB_MENU_INITIALIZE)
{
@@
-3081,8
+3081,8
@@
static void DrawInfoScreen_CreditsScreen(int screen_nr)
int ystep_head = getMenuTextStep(spacing_head, font_head);
int ystep_para = getMenuTextStep(spacing_para, font_text);
int ystep_line = getMenuTextStep(spacing_line, font_text);
int ystep_head = getMenuTextStep(spacing_head, font_head);
int ystep_para = getMenuTextStep(spacing_para, font_text);
int ystep_line = getMenuTextStep(spacing_line, font_text);
- int ystart
= mSY - SY + 100
;
- int ybottom = mSY - SY +
SYSIZE - 20
;
+ int ystart
= mSY - SY + MENU_SCREEN_INFO_YSTART1
;
+ int ybottom = mSY - SY +
MENU_SCREEN_INFO_YBOTTOM
;
ClearField();
DrawHeadline();
ClearField();
DrawHeadline();
@@
-3382,8
+3382,8
@@
void DrawInfoScreen_Program()
int ystep_head = getMenuTextStep(spacing_head, font_head);
int ystep_para = getMenuTextStep(spacing_para, font_text);
int ystep_line = getMenuTextStep(spacing_line, font_text);
int ystep_head = getMenuTextStep(spacing_head, font_head);
int ystep_para = getMenuTextStep(spacing_para, font_text);
int ystep_line = getMenuTextStep(spacing_line, font_text);
- int ystart
= mSY - SY + 100
;
- int ybottom = mSY - SY +
SYSIZE - 20
;
+ int ystart
= mSY - SY + MENU_SCREEN_INFO_YSTART1
;
+ int ybottom = mSY - SY +
MENU_SCREEN_INFO_YBOTTOM
;
SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_PROGRAM);
SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_PROGRAM);
@@
-3468,8
+3468,8
@@
void DrawInfoScreen_Version()
int ystep_head = getMenuTextStep(spacing_head, font_head);
int ystep_para = getMenuTextStep(spacing_para, font_text);
int ystep_line = getMenuTextStep(spacing_line, font_text);
int ystep_head = getMenuTextStep(spacing_head, font_head);
int ystep_para = getMenuTextStep(spacing_para, font_text);
int ystep_line = getMenuTextStep(spacing_line, font_text);
- int ystart = mSY - SY +
100
;
- int ybottom = mSY - SY +
SYSIZE - 20
;
+ int ystart = mSY - SY +
MENU_SCREEN_INFO_YSTART1
;
+ int ybottom = mSY - SY +
MENU_SCREEN_INFO_YBOTTOM
;
int xstart1 = mSX - SX + 2 * xstep;
int xstart2 = mSX - SX + 18 * xstep;
int xstart3 = mSX - SX + 28 * xstep;
int xstart1 = mSX - SX + 2 * xstep;
int xstart2 = mSX - SX + 18 * xstep;
int xstart3 = mSX - SX + 28 * xstep;
@@
-3655,8
+3655,8
@@
void DrawInfoScreen_LevelSet()
struct TitleMessageInfo *tmi = &readme;
char *filename = getLevelSetInfoFilename();
char *title = "Level Set Information:";
struct TitleMessageInfo *tmi = &readme;
char *filename = getLevelSetInfoFilename();
char *title = "Level Set Information:";
- int ystart
= mSY - SY + 100
;
- int ybottom = mSY - SY +
SYSIZE - 20
;
+ int ystart
= mSY - SY + MENU_SCREEN_INFO_YSTART1
;
+ int ybottom = mSY - SY +
MENU_SCREEN_INFO_YBOTTOM
;
if (filename == NULL)
{
if (filename == NULL)
{
@@
-3688,7
+3688,7
@@
void DrawInfoScreen_LevelSet()
/* if height set to "-1", automatically determine by playfield height */
if (tmi->height == -1)
/* if height set to "-1", automatically determine by playfield height */
if (tmi->height == -1)
- tmi->height =
SYSIZE - 20
- tmi->y - 10;
+ tmi->height =
MENU_SCREEN_INFO_YBOTTOM
- tmi->y - 10;
/* if chars set to "-1", automatically determine by text and font width */
if (tmi->chars == -1)
/* if chars set to "-1", automatically determine by text and font width */
if (tmi->chars == -1)