projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
740b7b5
)
moved drawing program info on startup to separate function
author
Holger Schemel
<info@artsoft.org>
Mon, 1 Oct 2018 18:52:00 +0000
(20:52 +0200)
committer
Holger Schemel
<info@artsoft.org>
Mon, 1 Oct 2018 18:52:00 +0000
(20:52 +0200)
src/init.c
patch
|
blob
|
history
diff --git
a/src/init.c
b/src/init.c
index 1e8d7e825db985c41cbb9526562890a5ef137f0e..3bb81ac08527d9bf7c84df25a4c58fea28d8202f 100644
(file)
--- a/
src/init.c
+++ b/
src/init.c
@@
-136,6
+136,20
@@
static void DrawInitAnim(void)
FrameCounter++;
}
FrameCounter++;
}
+static void DrawProgramInfo(void)
+{
+ int font1_nr = FC_YELLOW;
+ int font2_nr = FC_RED;
+ int font2_height = getFontHeight(font2_nr);
+ int ypos1 = 20;
+ int ypos2 = 50;
+ int ypos3 = WIN_YSIZE - 20 - font2_height;
+
+ DrawInitText(getProgramInitString(), ypos1, font1_nr);
+ DrawInitText(setup.internal.program_copyright, ypos2, font2_nr);
+ DrawInitText(setup.internal.program_website, ypos3, font2_nr);
+}
+
static void FreeGadgets(void)
{
FreeLevelEditorGadgets();
static void FreeGadgets(void)
{
FreeLevelEditorGadgets();
@@
-5327,7
+5341,6
@@
static void InitGfx(void)
char *filename_font_initial = NULL;
char *filename_anim_initial = NULL;
Bitmap *bitmap_font_initial = NULL;
char *filename_font_initial = NULL;
char *filename_anim_initial = NULL;
Bitmap *bitmap_font_initial = NULL;
- int font_height;
int i, j;
/* determine settings for initial font (for displaying startup messages) */
int i, j;
/* determine settings for initial font (for displaying startup messages) */
@@
-5378,12
+5391,7
@@
static void InitGfx(void)
InitFontGraphicInfo();
InitFontGraphicInfo();
- font_height = getFontHeight(FC_RED);
-
- DrawInitText(getProgramInitString(), 20, FC_YELLOW);
- DrawInitText(setup.internal.program_copyright, 50, FC_RED);
- DrawInitText(setup.internal.program_website, WIN_YSIZE - 20 - font_height,
- FC_RED);
+ DrawProgramInfo();
DrawInitText("Loading graphics", 120, FC_GREEN);
DrawInitText("Loading graphics", 120, FC_GREEN);