projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
improved handling network errors (show message instead of stopping program)
[rocksndiamonds.git]
/
src
/
init.c
diff --git
a/src/init.c
b/src/init.c
index b32141fbd7320ecbe26ab6769ea1961d4580e248..ffb825943520cec7a3ddf10f7b3b21622e62527f 100644
(file)
--- a/
src/init.c
+++ b/
src/init.c
@@
-5605,27
+5605,26
@@
static void InitArtworkDone()
InitGlobalAnimations();
}
InitGlobalAnimations();
}
-void InitNetworkSe
rver
()
+void InitNetworkSe
ttings
()
{
{
-#if defined(NETWORK_AVALIABLE)
- int nr_wanted;
-#endif
+ InitNetworkInfo(options.network || setup.network_mode,
+ FALSE,
+ options.serveronly,
+ options.server_host,
+ options.server_port);
+}
- if (!options.network)
+void InitNetworkServer()
+{
+ if (!network.enabled)
return;
return;
-#if defined(NETWORK_AVALIABLE)
- nr_wanted = Request("Choose player", REQ_PLAYER | REQ_STAY_CLOSED);
-
- if (!ConnectToServer(options.server_host, options.server_port))
+ if (!ConnectToServer(network.server_host, network.server_port))
Error(ERR_EXIT, "cannot connect to network game server");
SendToServer_PlayerName(setup.player_name);
SendToServer_ProtocolVersion();
Error(ERR_EXIT, "cannot connect to network game server");
SendToServer_PlayerName(setup.player_name);
SendToServer_ProtocolVersion();
-
- if (nr_wanted)
- SendToServer_NrWanted(nr_wanted);
-#endif
+ SendToServer_NrWanted(setup.network_player_nr + 1);
}
static boolean CheckArtworkConfigForCustomElements(char *filename)
}
static boolean CheckArtworkConfigForCustomElements(char *filename)
@@
-5998,10
+5997,12
@@
void OpenAll()
if (options.execute_command)
Execute_Command(options.execute_command);
if (options.execute_command)
Execute_Command(options.execute_command);
- if (options.serveronly)
+ InitNetworkSettings();
+
+ if (network.serveronly)
{
#if defined(PLATFORM_UNIX)
{
#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
#else
Error(ERR_WARN, "networking only supported in Unix version");
#endif