dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

When declining to buy a company, ask the next company immediately

Browse Source
This commit is contained in:
Jonathan G Rennison
2021-10-24 00:07:54 +01:00
parent a9c2c7288a
commit ec8512e2ea
9 changed files with 45 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/economy.cpp
View File

@@ -2285,6 +2285,8 @@ static void DoAcquireCompany(Company *c)
if (c->is_ai) AI::Stop(c->index);
c->bankrupt_asked = 0;
DeleteCompanyWindows(ci);
InvalidateWindowClassesData(WC_TRAINS_LIST, 0);
InvalidateWindowClassesData(WC_TRACE_RESTRICT_SLOTS, 0);
@@ -2429,6 +2431,31 @@ CommandCost CmdBuyCompany(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32
return cost;
}
/**
* Decline to buy up another company.
* When a competing company is gone bankrupt you get the chance to purchase
* that company, actively decline the offer.
* @param tile unused
* @param flags type of operation
* @param p1 company to buy up
* @param p2 unused
* @param text unused
* @return the cost of this operation or an error
*/
CommandCost CmdDeclineBuyCompany(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
{
CompanyID target_company = (CompanyID)p1;
Company *c = Company::GetIfValid(target_company);
if (c == nullptr) return CommandCost();
if (flags & DC_EXEC) {
if (c->bankrupt_last_asked == _current_company) {
c->bankrupt_timeout = 0;
}
}
return CommandCost();
}
uint ScaleQuantity(uint amount, int scale_factor)
{
scale_factor += 200; // ensure factor is positive