(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.

1 files changed, 2 insertions, 4 deletions

diff --git a/src/company_cmd.cpp b/src/company_cmd.cpp
index 8659a82d2..ef694d8f2 100644
--- a/src/company_cmd.cpp
+++ b/src/company_cmd.cpp
@@ -722,10 +722,10 @@ CommandCost CmdCompanyCtrl(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
 
 			/* Joining Client:
 			 * _local_company: COMPANY_SPECTATOR
-			 * _network_playas/cid = requested company/clientid
+			 * cid = clientid
 			 *
 			 * Other client(s)/server:
-			 * _local_company/_network_playas: what they play as
+			 * _local_company: what they play as
 			 * cid = requested company/company of joining client */
 			ClientID cid = (ClientID)p2;
 
@@ -744,8 +744,6 @@ CommandCost CmdCompanyCtrl(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
 				if (_network_server) {
 					ci->client_playas = COMPANY_SPECTATOR;
 					NetworkUpdateClientInfo(ci->client_id);
-				} else if (_local_company == COMPANY_SPECTATOR) {
-					_network_playas = COMPANY_SPECTATOR;
 				}
 				break;
 			}