mirror of
https://github.com/OpenTTD/OpenTTD
synced 2026-01-26 21:54:22 +01:00
(svn r15775) [0.7] -Backport from trunk:
- Fix: Do not show the message about reporting an AI crash for the dummy AI (r15774) - Fix: Number of active clients was not always properly updated [FS#2475] (r15773) - Fix: Settings from the [gameopt] section (from old 0.6 config files) were overwritten with default values (r15771) - Fix: Infinite loop when skipping sprites when a GRF is invalid (or truncated) (r15767) - Fix: Crash when opening the content list window twice; inconsistencies when clicking download twice [FS#2744] (r15766)
This commit is contained in:
@@ -346,7 +346,7 @@ static uint NetworkCountActiveClients()
|
||||
static bool _min_active_clients_paused = false;
|
||||
|
||||
/* Check if the minimum number of active clients has been reached and pause or unpause the game as appropriate */
|
||||
void CheckMinActiveClients()
|
||||
static void CheckMinActiveClients()
|
||||
{
|
||||
if (!_network_dedicated) return;
|
||||
|
||||
@@ -466,8 +466,6 @@ void NetworkCloseClient(NetworkClientSocket *cs)
|
||||
|
||||
delete cs->GetInfo();
|
||||
delete cs;
|
||||
|
||||
CheckMinActiveClients();
|
||||
}
|
||||
|
||||
/* For the server, to accept new clients */
|
||||
@@ -820,7 +818,6 @@ bool NetworkServerStart()
|
||||
if (_network_dedicated) IConsoleCmdExec("exec scripts/on_dedicated.scr 0");
|
||||
|
||||
_min_active_clients_paused = false;
|
||||
CheckMinActiveClients();
|
||||
|
||||
/* Try to register us to the master server */
|
||||
_network_last_advertise_frame = 0;
|
||||
@@ -1028,6 +1025,7 @@ void NetworkGameLoop()
|
||||
cp->company = (CompanyID)company;
|
||||
}
|
||||
#endif /* DEBUG_DUMP_COMMANDS */
|
||||
CheckMinActiveClients();
|
||||
|
||||
bool send_frame = false;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user