projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20070203-1-src
[rocksndiamonds.git]
/
src
/
tools.c
diff --git
a/src/tools.c
b/src/tools.c
index d68819823f2fdeb5db4eceb610aa22db4f848226..84198618ee2a7baad4d783662277f6f49f6ad158 100644
(file)
--- a/
src/tools.c
+++ b/
src/tools.c
@@
-1612,9
+1612,17
@@
void AnimateEnvelope(int envelope_nr, int anim_mode, int action)
for (yy = 0; yy < ysize; yy++) for (xx = 0; xx < xsize; xx++)
DrawEnvelopeBackground(envelope_nr, sx,sy, xx,yy, xsize, ysize, font_nr);
for (yy = 0; yy < ysize; yy++) for (xx = 0; xx < xsize; xx++)
DrawEnvelopeBackground(envelope_nr, sx,sy, xx,yy, xsize, ysize, font_nr);
+#if 1
+ DrawTextBuffer(SX + sx + font_width, SY + sy + font_height,
+ level.envelope[envelope_nr].text, font_nr, max_xsize,
+ xsize - 2, ysize - 2, mask_mode,
+ level.envelope[envelope_nr].autowrap,
+ level.envelope[envelope_nr].centered);
+#else
DrawTextToTextArea(SX + sx + font_width, SY + sy + font_height,
level.envelope[envelope_nr].text, font_nr, max_xsize,
xsize - 2, ysize - 2, mask_mode);
DrawTextToTextArea(SX + sx + font_width, SY + sy + font_height,
level.envelope[envelope_nr].text, font_nr, max_xsize,
xsize - 2, ysize - 2, mask_mode);
+#endif
redraw_mask |= REDRAW_FIELD | REDRAW_FROM_BACKBUFFER;
BackToFront();
redraw_mask |= REDRAW_FIELD | REDRAW_FROM_BACKBUFFER;
BackToFront();
@@
-1778,7
+1786,7
@@
static void DrawPreviewLevelExt(int from_x, int from_y)
#define MICROLABEL_IMPORTED_BY_HEAD 6
#define MICROLABEL_IMPORTED_BY 7
#define MICROLABEL_IMPORTED_BY_HEAD 6
#define MICROLABEL_IMPORTED_BY 7
-static int getMaxTextLength(struct
Menu
PosInfo *pos, int font_nr)
+static int getMaxTextLength(struct
Text
PosInfo *pos, int font_nr)
{
int max_text_width = SXSIZE;
int font_width = getFontWidth(font_nr);
{
int max_text_width = SXSIZE;
int font_width = getFontWidth(font_nr);
@@
-1795,7
+1803,7
@@
static int getMaxTextLength(struct MenuPosInfo *pos, int font_nr)
static void DrawPreviewLevelLabelExt(int mode)
{
static void DrawPreviewLevelLabelExt(int mode)
{
- struct
Menu
PosInfo *pos = &menu.main.text.level_info_2;
+ struct
Text
PosInfo *pos = &menu.main.text.level_info_2;
char label_text[MAX_OUTPUT_LINESIZE + 1];
int max_len_label_text;
int font_nr = FONT_TEXT_2;
char label_text[MAX_OUTPUT_LINESIZE + 1];
int max_len_label_text;
int font_nr = FONT_TEXT_2;
@@
-1812,6
+1820,11
@@
static void DrawPreviewLevelLabelExt(int mode)
max_len_label_text = SXSIZE / getFontWidth(font_nr);
#endif
max_len_label_text = SXSIZE / getFontWidth(font_nr);
#endif
+#if 1
+ if (pos->chars != -1)
+ max_len_label_text = pos->chars;
+#endif
+
for (i = 0; i < max_len_label_text; i++)
label_text[i] = ' ';
label_text[max_len_label_text] = '\0';
for (i = 0; i < max_len_label_text; i++)
label_text[i] = ' ';
label_text[max_len_label_text] = '\0';
@@
-1898,7
+1911,7
@@
void DrawPreviewLevel(boolean restart)
if (leveldir_current->name)
{
if (leveldir_current->name)
{
- struct
Menu
PosInfo *pos = &menu.main.text.level_info_1;
+ struct
Text
PosInfo *pos = &menu.main.text.level_info_1;
char label_text[MAX_OUTPUT_LINESIZE + 1];
int font_nr = FONT_TEXT_1;
#if 1
char label_text[MAX_OUTPUT_LINESIZE + 1];
int font_nr = FONT_TEXT_1;
#if 1
@@
-1911,6
+1924,11
@@
void DrawPreviewLevel(boolean restart)
int lxpos, lypos;
#endif
int lxpos, lypos;
#endif
+#if 1
+ if (pos->chars != -1)
+ max_len_label_text = pos->chars;
+#endif
+
strncpy(label_text, leveldir_current->name, max_len_label_text);
label_text[max_len_label_text] = '\0';
strncpy(label_text, leveldir_current->name, max_len_label_text);
label_text[max_len_label_text] = '\0';