mirror/OpenTTD
1
0
Fork 1
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-09-03 11:59:15 +00:00
Code Issues Activity

(svn r16360) -Codechange: don't use _network_playas as a 'second' _local_company, but only as a storage location for the company you want to join in MP.

Browse Source
This commit is contained in:
rubidium
2009-05-19 21:20:14 +00:00
parent 00bc2659f2
commit 9f4d64bda0
11 changed files with 38 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/openttd.cpp
View File

@@ -675,26 +675,24 @@ int ttd_main(int argc, char *argv[])
if (network_conn != NULL) {
const char *port = NULL;
const char *company = NULL;
uint16 rport;
rport = NETWORK_DEFAULT_PORT;
_network_playas = COMPANY_NEW_COMPANY;
uint16 rport = NETWORK_DEFAULT_PORT;
CompanyID join_as = COMPANY_NEW_COMPANY;
ParseConnectionString(&company, &port, network_conn);
if (company != NULL) {
_network_playas = (CompanyID)atoi(company);
join_as = (CompanyID)atoi(company);
if (_network_playas != COMPANY_SPECTATOR) {
_network_playas--;
if (_network_playas >= MAX_COMPANIES) return false;
if (join_as != COMPANY_SPECTATOR) {
join_as--;
if (join_as >= MAX_COMPANIES) return false;
}
}
if (port != NULL) rport = atoi(port);
LoadIntroGame();
_switch_mode = SM_NONE;
NetworkClientConnectGame(NetworkAddress(network_conn, rport));
NetworkClientConnectGame(NetworkAddress(network_conn, rport), join_as);
}
}
#endif /* ENABLE_NETWORK */
@@ -1197,8 +1195,7 @@ void GameLoop()
if (_network_reconnect > 0 && --_network_reconnect == 0) {
/* This means that we want to reconnect to the last host
* We do this here, because it means that the network is really closed */
_network_playas = COMPANY_SPECTATOR;
NetworkClientConnectGame(NetworkAddress(_settings_client.network.last_host, _settings_client.network.last_port));
NetworkClientConnectGame(NetworkAddress(_settings_client.network.last_host, _settings_client.network.last_port), COMPANY_SPECTATOR);
}
/* Singleplayer */
StateGameLoop();