X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.c;h=b0ed61da0998f84cb9ba1e7a6032fd0b3e71dfda;hb=50f0681cf3069e35f434c03825ad56bd80dabcbf;hp=38dd52b693e57de59e6d1b043d2b88c4431674d9;hpb=1ec7a01403d374273c3090fe93ca2e59869802f0;p=rocksndiamonds.git diff --git a/src/init.c b/src/init.c index 38dd52b6..b0ed61da 100644 --- a/src/init.c +++ b/src/init.c @@ -5075,6 +5075,7 @@ void InitGfx() InitGfxBuffers(); InitGfxCustomArtworkInfo(); + InitGfxOtherSettings(); bitmap_font_initial = LoadCustomImage(filename_font_initial); @@ -5158,7 +5159,7 @@ void InitGfx() init_last = init; } -void RedrawBackground() +void RedrawGlobalBorder() { BlitBitmap(graphic_info[IMG_GLOBAL_BORDER].bitmap, backbuffer, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0); @@ -5575,7 +5576,7 @@ void ReloadCustomArtwork(int force_reload) FadeOut(REDRAW_ALL); - RedrawBackground(); + RedrawGlobalBorder(); /* force redraw of (open or closed) door graphics */ SetDoorState(DOOR_OPEN_ALL); @@ -5672,6 +5673,10 @@ void OpenAll() print_timestamp_time("[init global stuff]"); + InitSetup(); + + print_timestamp_time("[init setup/config stuff (1)]"); + if (options.execute_command) Execute_Command(options.execute_command); @@ -5686,10 +5691,6 @@ void OpenAll() exit(0); /* never reached, server loops forever */ } - InitSetup(); - - print_timestamp_time("[init setup/config stuff (1)]"); - InitGameInfo(); print_timestamp_time("[init setup/config stuff (2)]"); InitPlayerInfo();