mirror of
https://github.com/OpenTTD/OpenTTD.git
synced 2025-02-02 12:24:15 +00:00
(svn r1061) -Fix: [Network] Compiling without ENABLE_NETWORK now works again correctly
This commit is contained in:
parent
9ced62e239
commit
2e7f669153
@ -398,6 +398,7 @@ static void PlayersCheckBankrupt(Player *p)
|
||||
} else {
|
||||
// If we are the server, make sure it is clear that his player is no
|
||||
// longer with us!
|
||||
#ifdef ENABLE_NETWORK
|
||||
if (IS_HUMAN_PLAYER(owner) && _network_server) {
|
||||
NetworkClientInfo *ci;
|
||||
ci = NetworkFindClientInfoFromIndex(_network_own_client_index);
|
||||
@ -405,6 +406,7 @@ static void PlayersCheckBankrupt(Player *p)
|
||||
// Send the new info to all the clients
|
||||
NetworkUpdateClientInfo(_network_own_client_index);
|
||||
}
|
||||
#endif /* ENABLE_NETWORK */
|
||||
// Make sure the player no longer controls the company
|
||||
if (IS_HUMAN_PLAYER(owner) && owner == _local_player) {
|
||||
// Switch the player to spectator..
|
||||
|
6
ttd.c
6
ttd.c
@ -868,8 +868,10 @@ void SwitchMode(int new_mode)
|
||||
break;
|
||||
|
||||
case SM_NEWGAME:
|
||||
#ifdef ENABLE_NETWORK
|
||||
if (_network_server)
|
||||
snprintf(_network_game_info.map_name, 40, "Random");
|
||||
#endif /* ENABLE_NETWORK */
|
||||
MakeNewGame();
|
||||
break;
|
||||
|
||||
@ -887,8 +889,10 @@ normal_load:
|
||||
_opt_mod_ptr = &_opt;
|
||||
_local_player = 0;
|
||||
DoCommandP(0, 0, 0, NULL, CMD_PAUSE); // decrease pause counter (was increased from opening load dialog)
|
||||
#ifdef ENABLE_NETWORK
|
||||
if (_network_server)
|
||||
snprintf(_network_game_info.map_name, 40, "Loaded game");
|
||||
#endif /* ENABLE_NETWORK */
|
||||
}
|
||||
break;
|
||||
}
|
||||
@ -912,8 +916,10 @@ normal_load:
|
||||
// delete all stations owned by a player
|
||||
DeleteAllPlayerStations();
|
||||
|
||||
#ifdef ENABLE_NETWORK
|
||||
if (_network_server)
|
||||
snprintf(_network_game_info.map_name, 40, "Loaded scenario");
|
||||
#endif /* ENABLE_NETWORK */
|
||||
} else
|
||||
ShowErrorMessage(INVALID_STRING_ID, STR_4009_GAME_LOAD_FAILED, 0, 0);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user