summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortruelight <truelight@openttd.org>2004-12-13 17:58:53 +0000
committertruelight <truelight@openttd.org>2004-12-13 17:58:53 +0000
commit2e7f669153d57fe7c5b1c364c0ec146e6999f470 (patch)
tree40c2e0e0f645eeb8329ef54bffbf9882a49cc521
parent9ced62e239c6ff424659cc1151632766d366da20 (diff)
downloadopenttd-2e7f669153d57fe7c5b1c364c0ec146e6999f470.tar.xz
(svn r1061) -Fix: [Network] Compiling without ENABLE_NETWORK now works again correctly
-rw-r--r--economy.c2
-rw-r--r--ttd.c6
2 files changed, 8 insertions, 0 deletions
diff --git a/economy.c b/economy.c
index 804763d1d..a42d6fd27 100644
--- a/economy.c
+++ b/economy.c
@@ -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..
diff --git a/ttd.c b/ttd.c
index 3fad1ee3f..cd1785999 100644
--- a/ttd.c
+++ b/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);