cpp/openttd-patchpack/source Changeset - r15808:a0491f9f3db0

Changeset - r15808:a0491f9f3db0

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

rubidium - 14 years ago 2010-08-15 11:58:20
rubidium@openttd.org

(svn r20497) -Fix [FS#3960]: non-dedicated servers failing to load a game caused the introgame to be the server's game causing desyncs when people tried to join

2 files changed with 9 insertions and 0 deletions:

src/network/network.cpp

src/openttd.cpp

0 comments (0 inline, 0 general)

src/network/network.cpp

➞

Show inline comments

@@ @@ -937,6 +937,9 @@ void NetworkDisconnect(bool blocking) @@
 	DeleteWindowById(WC_NETWORK_STATUS_WINDOW, 0);
 	NetworkClose();
 	/* Reinitialize the UDP stack, i.e. close all existing connections. */
 	NetworkUDPInitialize();
+}
 /**

src/openttd.cpp

➞

Show inline comments

@@ @@ -877,6 +877,7 @@ bool SafeSaveOrLoad(const char *filename @@
 		case SL_OK: return true;
 		case SL_REINIT:
 #ifdef ENABLE_NETWORK
 			if (_network_dedicated) {
 				/*
 				 * We need to reinit a network map...
@@ @@ -888,6 +889,11 @@ bool SafeSaveOrLoad(const char *filename @@
 				MakeNewGame(false, true);
 				return false;
+			}
 			if (_network_server) {
 				/* We can't load the intro game as server, so disconnect first. */
 				NetworkDisconnect();
+			}
 #endif /* ENABLE_NETWORK */
 			switch (ogm) {
 				default:

0 comments (0 inline, 0 general)