cpp/openttd-patchpack/source Changeset - r23307:4227056d7788

Changeset - r23307:4227056d7788

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

Peter Nelson - 6 years ago 2019-02-10 22:34:55
peter1138@openttd.org

Codechange: In CmdCompanyCtrl, move client_id assignment to where it is used, and document bit usage better.

1 file changed with 5 insertions and 4 deletions:

src/company_cmd.cpp

0 comments (0 inline, 0 general)

src/company_cmd.cpp

➞

Show inline comments

@@ @@ -816,7 +816,9 @@ void CompanyAdminRemove(CompanyID compan @@
  * @param p1 various functionality
  * - bits 0..15: CompanyCtrlAction
  * - bits 16..24: CompanyID
  * @param p2 ClientID
  * @param p2 various depending on CompanyCtrlAction
  * - bits 0..31: ClientID (with CCA_NEW)
  * - bits 0..1: CompanyRemoveReason (with CCA_DELETE)
  * @param text unused
  * @return the cost of this operation or an error
  */
@@ @@ -824,9 +826,6 @@ CommandCost CmdCompanyCtrl(TileIndex til @@
+{
 	InvalidateWindowData(WC_COMPANY_LEAGUE, 0, 0);
 	CompanyID company_id = (CompanyID)GB(p1, 16, 8);
 #ifdef ENABLE_NETWORK
 	ClientID client_id = (ClientID)p2;
 #endif /* ENABLE_NETWORK */
 	switch ((CompanyCtrlAction)GB(p1, 0, 16)) {
 		case CCA_NEW: { // Create a new company
@@ @@ -836,6 +835,8 @@ CommandCost CmdCompanyCtrl(TileIndex til @@
 #ifdef ENABLE_NETWORK
 			/* Has the network client a correct ClientIndex? */
 			if (!(flags & DC_EXEC)) return CommandCost();
 			ClientID client_id = (ClientID)p2;
 			NetworkClientInfo *ci = NetworkClientInfo::GetByClientID(client_id);
 #ifndef DEBUG_DUMP_COMMANDS
 			/* When replaying the client ID is not a valid client; there

0 comments (0 inline, 0 general)