diff options
| author | rubidium <rubidium@openttd.org> | 2008-12-24 00:03:47 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2008-12-24 00:03:47 +0000 |
| commit | 81f409e8e76fb26370e0639f7846ebbb8f74b2bd (patch) | |
| tree | 9167bc72abf5c65151cbc6c136430806ed72c9e5 | |
| parent | e6ff168508515ba4bf130106f100654d65685fd2 (diff) | |
| download | openttd-81f409e8e76fb26370e0639f7846ebbb8f74b2bd.tar.xz | |
(svn r14733) -Fix (r14730): creating new companies didn't always work as expected.
| -rw-r--r-- | src/company_cmd.cpp | 4 | ||||
| -rw-r--r-- | src/network/network_server.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/company_cmd.cpp b/src/company_cmd.cpp index 860246f5c..440d324d0 100644 --- a/src/company_cmd.cpp +++ b/src/company_cmd.cpp @@ -808,11 +808,11 @@ CommandCost CmdCompanyCtrl(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) * Other client(s)/server: * _local_company/_network_playas: what they play as * cid = requested company/company of joining client */ - ClientIndex cid = (ClientIndex)p2; + ClientID cid = (ClientID)p2; /* Has the network client a correct ClientIndex? */ if (!(flags & DC_EXEC)) return CommandCost(); - NetworkClientInfo *ci = NetworkFindClientInfoFromIndex(cid); + NetworkClientInfo *ci = NetworkFindClientInfoFromClientID(cid); if (ci == NULL) return CommandCost(); /* Delete multiplayer progress bar */ diff --git a/src/network/network_server.cpp b/src/network/network_server.cpp index d48efe55e..dcf9f3cb1 100644 --- a/src/network/network_server.cpp +++ b/src/network/network_server.cpp @@ -917,7 +917,7 @@ DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_COMMAND) * spectator, but that is not allowed any commands. So do an impersonation. The drawback * of this is that the first company's last_built_tile is also updated... */ cp->company = OWNER_BEGIN; - cp->p2 = cs->index; // XXX - UGLY! p2 is mis-used to get the client-id in CmdCompanyCtrl + cp->p2 = cs->client_id; } // The frame can be executed in the same frame as the next frame-packet |