projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20070124-2-src
[rocksndiamonds.git]
/
src
/
screens.c
diff --git
a/src/screens.c
b/src/screens.c
index c78cfd13bda9f9a3cf12372cea87f4ba3687e84f..fa44e771c24fd1632412edd15630c186f533aaca 100644
(file)
--- a/
src/screens.c
+++ b/
src/screens.c
@@
-505,8
+505,8
@@
static void DrawCursorAndText_Main_Ext(int nr, boolean active_text,
if (pos_text != NULL && text != NULL)
{
struct MenuPosInfo *pos = pos_text;
if (pos_text != NULL && text != NULL)
{
struct MenuPosInfo *pos = pos_text;
- int x = mSX + ALIGNED_
XPOS(pos->x, pos->width, pos->align
);
- int y = mSY +
pos->y
;
+ int x = mSX + ALIGNED_
MENU_XPOS(pos
);
+ int y = mSY +
ALIGNED_MENU_YPOS(pos)
;
DrawBackgroundForFont(x, y, pos->width, pos->height, font_text);
DrawText(x, y, text, font_text);
DrawBackgroundForFont(x, y, pos->width, pos->height, font_text);
DrawText(x, y, text, font_text);
@@
-515,8
+515,8
@@
static void DrawCursorAndText_Main_Ext(int nr, boolean active_text,
if (pos_input != NULL && input != NULL)
{
struct MenuPosInfo *pos = pos_input;
if (pos_input != NULL && input != NULL)
{
struct MenuPosInfo *pos = pos_input;
- int x = mSX + ALIGNED_
XPOS(pos->x, pos->width, pos->align
);
- int y = mSY +
pos->y
;
+ int x = mSX + ALIGNED_
MENU_XPOS(pos
);
+ int y = mSY +
ALIGNED_MENU_YPOS(pos)
;
DrawBackgroundForFont(x, y, pos->width, pos->height, font_input);
DrawText(x, y, input, font_input);
DrawBackgroundForFont(x, y, pos->width, pos->height, font_input);
DrawText(x, y, input, font_input);
@@
-553,8
+553,8
@@
static boolean insideMenuPosRect(struct MenuPosInfo *rect, int x, int y)
if (rect == NULL)
return FALSE;
if (rect == NULL)
return FALSE;
- int rect_x = ALIGNED_
XPOS(rect->x, rect->width, rect->align
);
- int rect_y =
rect->y
;
+ int rect_x = ALIGNED_
MENU_XPOS(rect
);
+ int rect_y =
ALIGNED_MENU_YPOS(rect)
;
return (x >= rect_x && x < rect_x + rect->width &&
y >= rect_y && y < rect_y + rect->height);
return (x >= rect_x && x < rect_x + rect->width &&
y >= rect_y && y < rect_y + rect->height);
@@
-1849,7
+1849,11
@@
static char *getHelpText(int element, int action, int direction)
void DrawInfoScreen_HelpText(int element, int action, int direction, int ypos)
{
void DrawInfoScreen_HelpText(int element, int action, int direction, int ypos)
{
+#if 1
+ int font_nr = FONT_INFO_ELEMENTS;
+#else
int font_nr = FONT_LEVEL_NUMBER;
int font_nr = FONT_LEVEL_NUMBER;
+#endif
int font_width = getFontWidth(font_nr);
int sx = mSX + MINI_TILEX + TILEX + MINI_TILEX;
int sy = mSY + 65 + 2 * 32 + 1;
int font_width = getFontWidth(font_nr);
int sx = mSX + MINI_TILEX + TILEX + MINI_TILEX;
int sy = mSY + 65 + 2 * 32 + 1;
@@
-2452,7
+2456,11
@@
void DrawInfoScreen_LevelSet()
int ystart = 150;
int ybottom = SYSIZE - 20;
char *filename = getLevelSetInfoFilename();
int ystart = 150;
int ybottom = SYSIZE - 20;
char *filename = getLevelSetInfoFilename();
+#if 1
+ int font_nr = FONT_INFO_LEVELSET;
+#else
int font_nr = FONT_LEVEL_NUMBER;
int font_nr = FONT_LEVEL_NUMBER;
+#endif
int font_width = getFontWidth(font_nr);
int font_height = getFontHeight(font_nr);
int pad_x = 32;
int font_width = getFontWidth(font_nr);
int font_height = getFontHeight(font_nr);
int pad_x = 32;
@@
-2579,8
+2587,8
@@
void HandleTypeName(int newxpos, Key key)
struct MainControlInfo *mci = getMainControlInfo(MAIN_CONTROL_NAME);
#if 1
struct MenuPosInfo *pos = mci->pos_input;
struct MainControlInfo *mci = getMainControlInfo(MAIN_CONTROL_NAME);
#if 1
struct MenuPosInfo *pos = mci->pos_input;
- int startx = mSX + ALIGNED_
XPOS(pos->x, pos->width, pos->align
);
- int starty = mSY +
pos->y
;
+ int startx = mSX + ALIGNED_
MENU_XPOS(pos
);
+ int starty = mSY +
ALIGNED_MENU_YPOS(pos)
;
#endif
#if 1
static int xpos = 0;
#endif
#if 1
static int xpos = 0;
@@
-3407,6
+3415,7
@@
static struct TokenInfo setup_info_editor[] =
{ TYPE_SWITCH, &setup.editor.el_dx_boulderdash,"DX-Boulderdash:" },
#endif
{ TYPE_SWITCH, &setup.editor.el_chars, "Text Characters:" },
{ TYPE_SWITCH, &setup.editor.el_dx_boulderdash,"DX-Boulderdash:" },
#endif
{ TYPE_SWITCH, &setup.editor.el_chars, "Text Characters:" },
+ { TYPE_SWITCH, &setup.editor.el_steel_chars, "Text Characters (Steel):" },
{ TYPE_SWITCH, &setup.editor.el_custom, "Custom & Group Elements:" },
#if 0
{ TYPE_SWITCH, &setup.editor.el_headlines, "Headlines:" },
{ TYPE_SWITCH, &setup.editor.el_custom, "Custom & Group Elements:" },
#if 0
{ TYPE_SWITCH, &setup.editor.el_headlines, "Headlines:" },