projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20070302-1-src
[rocksndiamonds.git]
/
src
/
screens.c
diff --git
a/src/screens.c
b/src/screens.c
index dd25d120c15f80a5c68ce6d7c442a44a2f1fd5c6..6d3bd17057918404aa975464842771d8cf65b760 100644
(file)
--- a/
src/screens.c
+++ b/
src/screens.c
@@
-887,8
+887,8
@@
void DrawTitleScreenMessage(int nr, boolean initial)
max_chars_per_line = (WIN_XSIZE - 2 * pad_x) / font_width;
max_lines_per_screen = (WIN_YSIZE - pad_y) / font_height - 1;
max_chars_per_line = (WIN_XSIZE - 2 * pad_x) / font_width;
max_lines_per_screen = (WIN_YSIZE - pad_y) / font_height - 1;
- DrawTextF
romFile(sx, sy, filename, font_nr, max_chars_per_line
,
-
max_lines_per_screen
, FALSE);
+ DrawTextF
ile(sx, sy, filename, font_nr, max_chars_per_line, -1
,
+
max_lines_per_screen, -1, FALSE, FALSE
, FALSE);
game_status = last_game_status; /* restore current game status */
}
game_status = last_game_status; /* restore current game status */
}
@@
-2248,8
+2248,14
@@
void DrawInfoScreen_HelpText(int element, int action, int direction, int ypos)
if (strlen(text) <= max_chars_per_line) /* only one line of text */
sy += getFontHeight(font_nr) / 2;
if (strlen(text) <= max_chars_per_line) /* only one line of text */
sy += getFontHeight(font_nr) / 2;
+#if 1
+ DrawTextBuffer(sx, sy + ypos * ystep, text, font_nr,
+ max_chars_per_line, -1, max_lines_per_text, -1,
+ TRUE, FALSE, FALSE);
+#else
DrawTextWrapped(sx, sy + ypos * ystep, text, font_nr,
max_chars_per_line, max_lines_per_text);
DrawTextWrapped(sx, sy + ypos * ystep, text, font_nr,
max_chars_per_line, max_lines_per_text);
+#endif
}
void DrawInfoScreen_TitleScreen()
}
void DrawInfoScreen_TitleScreen()
@@
-2999,8
+3005,8
@@
void DrawInfoScreen_LevelSet()
"Press any key or button for info menu");
if (filename != NULL)
"Press any key or button for info menu");
if (filename != NULL)
- DrawTextF
romFile(sx, sy, filename, font_nr, max_chars_per_line
,
-
max_lines_per_screen
, TRUE);
+ DrawTextF
ile(sx, sy, filename, font_nr, max_chars_per_line, -1
,
+
max_lines_per_screen, -1, TRUE, FALSE
, TRUE);
else
DrawTextSCentered(ystart2, FONT_TEXT_2,
"No information for this level set.");
else
DrawTextSCentered(ystart2, FONT_TEXT_2,
"No information for this level set.");