projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20070312-4-src
[rocksndiamonds.git]
/
src
/
tools.c
diff --git
a/src/tools.c
b/src/tools.c
index f730529956853b6397486378f7b5f956c80017d3..61ae3e717e954c798de6eb3ca884419b5f378589 100644
(file)
--- a/
src/tools.c
+++ b/
src/tools.c
@@
-1820,6
+1820,15
@@
static void DrawPreviewLevelLabelExt(int mode)
struct TextPosInfo *pos = &menu.main.text.level_info_2;
char label_text[MAX_OUTPUT_LINESIZE + 1];
int max_len_label_text;
struct TextPosInfo *pos = &menu.main.text.level_info_2;
char label_text[MAX_OUTPUT_LINESIZE + 1];
int max_len_label_text;
+#if 1
+ int font_nr = pos->font;
+ int i;
+
+ if (mode == MICROLABEL_LEVEL_AUTHOR_HEAD ||
+ mode == MICROLABEL_IMPORTED_FROM_HEAD ||
+ mode == MICROLABEL_IMPORTED_BY_HEAD)
+ font_nr = pos->font_alt;
+#else
int font_nr = FONT_TEXT_2;
int i;
int font_nr = FONT_TEXT_2;
int i;
@@
-1827,6
+1836,7
@@
static void DrawPreviewLevelLabelExt(int mode)
mode == MICROLABEL_IMPORTED_FROM_HEAD ||
mode == MICROLABEL_IMPORTED_BY_HEAD)
font_nr = FONT_TEXT_3;
mode == MICROLABEL_IMPORTED_FROM_HEAD ||
mode == MICROLABEL_IMPORTED_BY_HEAD)
font_nr = FONT_TEXT_3;
+#endif
#if 1
max_len_label_text = getMaxTextLength(pos, font_nr);
#if 1
max_len_label_text = getMaxTextLength(pos, font_nr);
@@
-1893,8
+1903,10
@@
void DrawPreviewLevel(boolean restart)
int level_ysize = lev_fieldy + (show_level_border ? 2 : 0);
int last_game_status = game_status; /* save current game status */
int level_ysize = lev_fieldy + (show_level_border ? 2 : 0);
int last_game_status = game_status; /* save current game status */
+#if 0
/* force PREVIEW font on preview level */
game_status = GAME_MODE_PSEUDO_PREVIEW;
/* force PREVIEW font on preview level */
game_status = GAME_MODE_PSEUDO_PREVIEW;
+#endif
if (restart)
{
if (restart)
{
@@
-1927,7
+1939,11
@@
void DrawPreviewLevel(boolean restart)
{
struct TextPosInfo *pos = &menu.main.text.level_info_1;
char label_text[MAX_OUTPUT_LINESIZE + 1];
{
struct TextPosInfo *pos = &menu.main.text.level_info_1;
char label_text[MAX_OUTPUT_LINESIZE + 1];
+#if 1
+ int font_nr = pos->font;
+#else
int font_nr = FONT_TEXT_1;
int font_nr = FONT_TEXT_1;
+#endif
#if 1
int max_len_label_text = getMaxTextLength(pos, font_nr);
#else
#if 1
int max_len_label_text = getMaxTextLength(pos, font_nr);
#else
@@
-2610,7
+2626,7
@@
boolean Request(char *text, unsigned int req_state)
/* clear door drawing field */
DrawBackground(DX, DY, DXSIZE, DYSIZE);
/* clear door drawing field */
DrawBackground(DX, DY, DXSIZE, DYSIZE);
- /* force DOOR font
on preview level
*/
+ /* force DOOR font
inside door area
*/
game_status = GAME_MODE_PSEUDO_DOOR;
/* write text for request */
game_status = GAME_MODE_PSEUDO_DOOR;
/* write text for request */
@@
-5736,7
+5752,8
@@
void ResetGfxAnimation_EM(int x, int y, int tile)
}
void getGraphicSourceObjectExt_EM(int tile, int frame_em,
}
void getGraphicSourceObjectExt_EM(int tile, int frame_em,
- Bitmap **src_bitmap, int *src_x, int *src_y)
+ Bitmap **src_bitmap, int *src_x, int *src_y,
+ int x, int y)
{
int element = object_mapping[tile].element_rnd;
int action = object_mapping[tile].action;
{
int element = object_mapping[tile].element_rnd;
int action = object_mapping[tile].action;
@@
-5760,6
+5777,8
@@
void getGraphicSourceObjectExt_EM(int tile, int frame_em,
else
sync_frame = 7 - frame_em;
else
sync_frame = 7 - frame_em;
+ SetRandomAnimationValue(x, y);
+
int frame = getAnimationFrame(g->anim_frames,
g->anim_delay,
g->anim_mode,
int frame = getAnimationFrame(g->anim_frames,
g->anim_delay,
g->anim_mode,