diff options
| author | glx22 <glx22@users.noreply.github.com> | 2019-04-05 15:11:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-05 15:11:52 +0200 |
| commit | a1e492d0d8970217800ebd78d328c9ddf0f13a31 (patch) | |
| tree | c4135eccb649a412c2113f45b6306d95e9e08341 /src/company_cmd.cpp | |
| parent | fb6e31ca43b10b40fcaf1db0596dfaa48a1ecf20 (diff) | |
| download | openttd-a1e492d0d8970217800ebd78d328c9ddf0f13a31.tar.xz | |
Fix #7439: don't overwrite CompanyRemoveReason with ClientID (#7465)
Diffstat (limited to 'src/company_cmd.cpp')
| -rw-r--r-- | src/company_cmd.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/company_cmd.cpp b/src/company_cmd.cpp index 4d8750851..df0588f91 100644 --- a/src/company_cmd.cpp +++ b/src/company_cmd.cpp @@ -807,10 +807,9 @@ void CompanyAdminRemove(CompanyID company_id, CompanyRemoveReason reason) * @param flags operation to perform * @param p1 various functionality * - bits 0..15: CompanyCtrlAction - * - bits 16..24: CompanyID - * @param p2 various depending on CompanyCtrlAction - * - bits 0..31: ClientID (with CCA_NEW) - * - bits 0..1: CompanyRemoveReason (with CCA_DELETE) + * - bits 16..23: CompanyID + * - bits 24..31: CompanyRemoveReason (with CCA_DELETE) + * @param p2 ClientID * @param text unused * @return the cost of this operation or an error */ @@ -880,7 +879,7 @@ CommandCost CmdCompanyCtrl(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3 } case CCA_DELETE: { // Delete a company - CompanyRemoveReason reason = (CompanyRemoveReason)GB(p2, 0, 2); + CompanyRemoveReason reason = (CompanyRemoveReason)GB(p1, 24, 8); if (reason >= CRR_END) return CMD_ERROR; Company *c = Company::GetIfValid(company_id); |