InitGlobalAnimations();
}
-void InitNetworkServer()
+void InitNetworkSettings()
{
- if (setup.network_mode)
- options.network = TRUE;
+ InitNetworkInfo(options.network || setup.network_mode,
+ FALSE,
+ options.serveronly,
+ options.server_host,
+ options.server_port);
+}
- if (!options.network)
+void InitNetworkServer()
+{
+ if (!network.enabled)
return;
-#if defined(NETWORK_AVALIABLE)
- if (!ConnectToServer(options.server_host, options.server_port))
- Error(ERR_EXIT, "cannot connect to network game server");
+ if (!ConnectToServer(network.server_host, network.server_port))
+ {
+ Request("Cannot connect to network server!", REQ_CONFIRM);
+
+ network.enabled = FALSE;
+
+ return;
+ }
SendToServer_PlayerName(setup.player_name);
SendToServer_ProtocolVersion();
SendToServer_NrWanted(setup.network_player_nr + 1);
-#endif
}
static boolean CheckArtworkConfigForCustomElements(char *filename)
if (options.execute_command)
Execute_Command(options.execute_command);
- if (options.serveronly)
+ InitNetworkSettings();
+
+ if (network.serveronly)
{
#if defined(PLATFORM_UNIX)
- NetworkServer(options.server_port, options.serveronly);
+ NetworkServer(network.server_port, TRUE);
#else
Error(ERR_WARN, "networking only supported in Unix version");
#endif