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

(svn r20392) -Fix [FS#3993]: Prevent buying bankrupt companies when you'd get too many vehicles.

Browse Source
This commit is contained in:
alberth
2010-08-06 20:26:01 +00:00
parent 5cfc029523
commit 422a1ad242
3 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/company_cmd.cpp
View File

@@ -584,6 +584,25 @@ void InitializeCompanies()
_cur_company_tick_index = 0;
}
/**
* May company \a cbig buy company \a csmall?
* @param cbig Company buying \a csmall.
* @param csmall Company getting bought.
* @return Return \c true if it is allowed.
*/
bool MayCompanyTakeOver(CompanyID cbig, CompanyID csmall)
{
uint big_counts[4], small_counts[4];
CountCompanyVehicles(cbig, big_counts);
CountCompanyVehicles(csmall, small_counts);
/* Do the combined vehicle counts stay within the limits? */
return big_counts[VEH_TRAIN] + small_counts[VEH_TRAIN] <= _settings_game.vehicle.max_trains &&
big_counts[VEH_ROAD] + small_counts[VEH_ROAD] <= _settings_game.vehicle.max_roadveh &&
big_counts[VEH_SHIP] + small_counts[VEH_SHIP] <= _settings_game.vehicle.max_ships &&
big_counts[VEH_AIRCRAFT] + small_counts[VEH_AIRCRAFT] <= _settings_game.vehicle.max_aircraft;
}
/**
* Handle the bankruptcy take over of a company.
* Companies going bankrupt will ask the other companies in order of their
@@ -623,7 +642,8 @@ static void HandleBankruptcyTakeover(Company *c)
FOR_ALL_COMPANIES(c2) {
if (c2->bankrupt_asked == 0 && // Don't ask companies going bankrupt themselves
!HasBit(c->bankrupt_asked, c2->index) &&
best_performance < c2->old_economy[1].performance_history) {
best_performance < c2->old_economy[1].performance_history &&
MayCompanyTakeOver(c2->index, c->index)) {
best_performance = c2->old_economy[1].performance_history;
best = c2;
}