cpp/openttd-patchpack/source Changeset - r630:6ed61836c69a

Changeset - r630:6ed61836c69a

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

truelight - 19 years ago 2004-12-13 17:58:53
truelight@openttd.org

(svn r1061) -Fix: [Network] Compiling without ENABLE_NETWORK now works again correctly

2 files changed with 8 insertions and 0 deletions:

economy.c

ttd.c

0 comments (0 inline, 0 general)

economy.c

➞

Show inline comments

@@ @@ -398,6 +398,7 @@ static void PlayersCheckBankrupt(Player @@
 			} 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 @@
 					// 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..

ttd.c

➞

Show inline comments

@@ @@ -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);

0 comments (0 inline, 0 general)