cpp/openttd-patchpack/source Changeset - r9667:ed8384e30512

Changeset - r9667:ed8384e30512

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

rubidium - 16 years ago 2008-07-20 13:29:59
rubidium@openttd.org

(svn r13754) -Fix (r13731): one could not join companies from the command line.

1 file changed with 1 insertions and 1 deletions:

src/openttd.cpp

0 comments (0 inline, 0 general)

src/openttd.cpp

➞

Show inline comments

@@ @@ -620,25 +620,25 @@ int ttd_main(int argc, char *argv[]) @@
 			uint16 rport;
 			rport = NETWORK_DEFAULT_PORT;
 			_network_playas = PLAYER_NEW_COMPANY;
 			ParseConnectionString(&player, &port, network_conn);
 			if (player != NULL) {
 				_network_playas = (PlayerID)atoi(player);
 				if (_network_playas != PLAYER_SPECTATOR) {
 					_network_playas--;
-					if (!IsValidPlayerID(_network_playas)) return false;
+					if (_network_playas >= MAX_PLAYERS) return false;
+				}
+			}
 			if (port != NULL) rport = atoi(port);
 			LoadIntroGame();
 			_switch_mode = SM_NONE;
 			NetworkClientConnectGame(network_conn, rport);
+		}
+	}
 #endif /* ENABLE_NETWORK */
 	_video_driver->MainLoop();

0 comments (0 inline, 0 general)