mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r14733) -Fix (r14730): creating new companies didn't always work as expected.

This commit is contained in:
rubidium 2008-12-24 00:03:47 +00:00
parent c3746a55bb
commit 4a1f4144eb
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/company_cmd.cpp
View File

@ -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 */

2
src/network/network_server.cpp
View File

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