projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20140308-1-src
[rocksndiamonds.git]
/
src
/
editor.c
diff --git
a/src/editor.c
b/src/editor.c
index b611050cc31ba4900a020b70e12ba565812e819b..1fe6e544b86c631277e8a35ac611a8225c28177a 100644
(file)
--- a/
src/editor.c
+++ b/
src/editor.c
@@
-7751,6
+7751,7
@@
void DrawLevelEd()
#if 1
FadeOut(REDRAW_FIELD);
#if 1
FadeOut(REDRAW_FIELD);
+ // FadeOut(REDRAW_ALL);
#endif
#if 1
#endif
#if 1
@@
-7758,7
+7759,11
@@
void DrawLevelEd()
ChangeViewportPropertiesIfNeeded();
#endif
ChangeViewportPropertiesIfNeeded();
#endif
+#if 1
+ OpenDoor(DOOR_OPEN_1 | DOOR_OPEN_2 | DOOR_NO_DELAY);
+#else
OpenDoor(DOOR_OPEN_2 | DOOR_NO_DELAY);
OpenDoor(DOOR_OPEN_2 | DOOR_NO_DELAY);
+#endif
#if DEBUG
CheckElementDescriptions();
#if DEBUG
CheckElementDescriptions();
@@
-7832,11
+7837,16
@@
void DrawLevelEd()
#if 1
FadeIn(REDRAW_FIELD);
#if 1
FadeIn(REDRAW_FIELD);
+ // FadeIn(REDRAW_ALL);
#endif
/* copy actual editor door content to door double buffer for OpenDoor() */
#endif
/* copy actual editor door content to door double buffer for OpenDoor() */
+#if 1
+ BlitBitmap(drawto, bitmap_db_door_1, DX, DY, DXSIZE, DYSIZE, 0, 0);
+#else
BlitBitmap(drawto, bitmap_db_door,
DX, DY, DXSIZE, DYSIZE, DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1);
BlitBitmap(drawto, bitmap_db_door,
DX, DY, DXSIZE, DYSIZE, DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1);
+#endif
#if 1
/* draw new control window (with border) to window */
#if 1
/* draw new control window (with border) to window */
@@
-7844,7
+7854,9
@@
void DrawLevelEd()
BackToFront();
#endif
BackToFront();
#endif
+#if 0
OpenDoor(DOOR_OPEN_1);
OpenDoor(DOOR_OPEN_1);
+#endif
}
static void AdjustDrawingAreaGadgets()
}
static void AdjustDrawingAreaGadgets()
@@
-8532,9
+8544,23
@@
static int PrintElementDescriptionFromFile(char *filename, int start_line)
int sy = SY + pad_y + start_line * font_height;
int max_chars_per_line = (SXSIZE - 2 * pad_x) / font_width;
int max_lines_per_screen = (SYSIZE - pad_y) / font_height - 1;
int sy = SY + pad_y + start_line * font_height;
int max_chars_per_line = (SXSIZE - 2 * pad_x) / font_width;
int max_lines_per_screen = (SYSIZE - pad_y) / font_height - 1;
+ int max_lines_drawable = max_lines_per_screen - start_line;
+
+#if 0
+ printf("::: SYSIZE == %d [%d / %d / %d]\n", SYSIZE,
+ max_chars_per_line, max_lines_per_screen, max_lines_drawable);
+#endif
+
+ if (start_line >= max_lines_per_screen)
+ return FALSE;
+#if 1
+ return DrawTextFile(sx, sy, filename, font_nr, max_chars_per_line, -1,
+ max_lines_drawable, 0, -1, TRUE, FALSE, FALSE);
+#else
return DrawTextFile(sx, sy, filename, font_nr, max_chars_per_line, -1,
max_lines_per_screen, 0, -1, TRUE, FALSE, FALSE);
return DrawTextFile(sx, sy, filename, font_nr, max_chars_per_line, -1,
max_lines_per_screen, 0, -1, TRUE, FALSE, FALSE);
+#endif
}
static void DrawPropertiesInfo()
}
static void DrawPropertiesInfo()
@@
-8598,8
+8624,8
@@
static void DrawPropertiesInfo()
{ -1, NULL }
};
char *filename = getElementDescriptionFilename(properties_element);
{ -1, NULL }
};
char *filename = getElementDescriptionFilename(properties_element);
- char *percentage_text = "In this level:";
- char *properties_text = "Standard properties:";
+ char *percentage_text = "In this level:
";
+ char *properties_text = "Standard properties:
";
float percentage;
int num_elements_in_level;
int num_standard_properties = 0;
float percentage;
int num_elements_in_level;
int num_standard_properties = 0;