notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

moving stuff for faster splash screen display

Browse source
This commit is contained in:
Albert Cahalan 2005-01-17 02:06:23 +00:00
parent 04ed5c1ad1
commit 0e8f2a1e1c
1 changed files with 37 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

68
src/tuxpaint.c
View file

@ -2282,24 +2282,8 @@ int main(int argc, char * argv[])
do_setcursor(cursor_arrow); do_setcursor(cursor_arrow);
SDL_FillRect(screen, NULL, SDL_MapRGB(screen->format, 255, 255, 255));
dest.x = (WINDOW_WIDTH - img_title->w) / 2;
dest.y = (WINDOW_HEIGHT - img_title->h);
SDL_BlitSurface(img_title, NULL, screen, &dest);
snprintf(tmp_str, sizeof(tmp_str), "%s – %s", VER_VERSION, VER_DATE);
tmp_surf = render_text(medium_font, tmp_str, black);
dest.x = 20 + (WINDOW_WIDTH - img_title->w) / 2;
dest.y = WINDOW_HEIGHT - 60;
SDL_BlitSurface(tmp_surf, NULL, screen, &dest);
SDL_FreeSurface(tmp_surf);
SDL_Flip(screen);
playsound(0, SND_HARP, 1);
do_wait(); do_wait();
SDL_FreeSurface(img_title);
/* Set defaults! */ /* Set defaults! */
@ -7555,6 +7539,42 @@ static void setup(int argc, char * argv[])
SDL_Flip(screen); SDL_Flip(screen);
medium_font = TTF_OpenFont(DATA_PREFIX "fonts/default_font.ttf",
18 - (only_uppercase * 3));
if (medium_font == NULL)
{
fprintf(stderr,
"\nError: Can't load font file: "
DATA_PREFIX "fonts/default_font.ttf\n"
"The Simple DirectMedia Layer error that occurred was:\n"
"%s\n\n", SDL_GetError());
cleanup();
exit(1);
}
SDL_FillRect(screen, NULL, SDL_MapRGB(screen->format, 255, 255, 255));
dest.x = (WINDOW_WIDTH - img_title->w) / 2;
dest.y = (WINDOW_HEIGHT - img_title->h);
SDL_BlitSurface(img_title, NULL, screen, &dest);
char tmp_str[128];
snprintf(tmp_str, sizeof(tmp_str), "%s – %s", VER_VERSION, VER_DATE);
tmp_surf = render_text(medium_font, tmp_str, black);
dest.x = 20 + (WINDOW_WIDTH - img_title->w) / 2;
dest.y = WINDOW_HEIGHT - 60;
SDL_BlitSurface(tmp_surf, NULL, screen, &dest);
SDL_FreeSurface(tmp_surf);
SDL_Flip(screen);
playsound(0, SND_HARP, 1);
SDL_FreeSurface(img_title);
/* Load other images: */ /* Load other images: */
for (i = 0; i < NUM_TOOLS; i++) for (i = 0; i < NUM_TOOLS; i++)
@ -7661,22 +7681,6 @@ static void setup(int argc, char * argv[])
/* Load system fonts: */ /* Load system fonts: */
medium_font = TTF_OpenFont(DATA_PREFIX "fonts/default_font.ttf",
18 - (only_uppercase * 3));
if (medium_font == NULL)
{
fprintf(stderr,
"\nError: Can't load font file: "
DATA_PREFIX "fonts/default_font.ttf\n"
"The Simple DirectMedia Layer error that occurred was:\n"
"%s\n\n", SDL_GetError());
cleanup();
exit(1);
}
large_font = TTF_OpenFont(DATA_PREFIX "fonts/default_font.ttf", large_font = TTF_OpenFont(DATA_PREFIX "fonts/default_font.ttf",
36 - (only_uppercase * 3)); 36 - (only_uppercase * 3));