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();
{
game.restart_level = FALSE;
game.restart_game_message = NULL;
+ game.request_active = FALSE;
}
static void InitPlayerInfo(void)
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) */
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);
static void InitNetworkSettings(void)
{
- InitNetworkInfo(options.network || setup.network_mode,
+ boolean network_enabled = (options.network || setup.network_mode);
+ char *network_server = (options.server_host != NULL ? options.server_host :
+ setup.network_server_hostname);
+
+ if (strEqual(network_server, STR_NETWORK_AUTO_DETECT))
+ network_server = NULL;
+
+ InitNetworkInfo(network_enabled,
FALSE,
options.serveronly,
- options.server_host,
+ network_server,
options.server_port);
}
LimitScreenUpdates(FALSE);
+ if (game_status == GAME_MODE_LOADING)
+ DrawProgramInfo();
+
if (!ConnectToServer(network.server_host, network.server_port))
{
network.enabled = FALSE;
}
/* short time to recognize result of network initialization */
- Delay_WithScreenUpdates(1000);
+ if (game_status == GAME_MODE_LOADING)
+ Delay_WithScreenUpdates(1000);
}
static boolean CheckArtworkConfigForCustomElements(char *filename)