gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-06 14:27:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r24813) -Change: Offer engine previews only to companies which actually use the particular vehicle-type/cargo-type combination.

Browse Source
This commit is contained in:
frosch 2012-12-09 16:55:57 +00:00
parent 51fca5eec7
commit f93602aec9
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/engine.cpp
View File

@ -29,6 +29,7 @@
#include "engine_base.h" #include "engine_base.h"
#include "company_base.h" #include "company_base.h"
#include "vehicle_func.h" #include "vehicle_func.h"
#include "articulated_vehicles.h"
#include "table/strings.h" #include "table/strings.h"
#include "table/engines.h" #include "table/engines.h"
@ -767,13 +768,25 @@ static CompanyID GetPreviewCompany(Engine *e)
{ {
CompanyID best_company = INVALID_COMPANY; CompanyID best_company = INVALID_COMPANY;
/* For trains the cargomask has no useful meaning, since you can attach other wagons */
uint32 cargomask = e->type != VEH_TRAIN ? GetUnionOfArticulatedRefitMasks(e->index, true) : (uint32)-1;
int32 best_hist = -1; int32 best_hist = -1;
const Company *c; const Company *c;
FOR_ALL_COMPANIES(c) { FOR_ALL_COMPANIES(c) {
if (c->block_preview == 0 && !HasBit(e->preview_asked, c->index) && if (c->block_preview == 0 && !HasBit(e->preview_asked, c->index) &&
c->old_economy[0].performance_history > best_hist) { c->old_economy[0].performance_history > best_hist) {
best_hist = c->old_economy[0].performance_history;
best_company = c->index; /* Check whether the company uses similar vehicles */
Vehicle *v;
FOR_ALL_VEHICLES(v) {
if (v->owner != c->index || v->type != e->type) continue;
if (!v->GetEngine()->CanCarryCargo() || !HasBit(cargomask, v->cargo_type)) continue;
best_hist = c->old_economy[0].performance_history;
best_company = c->index;
break;
}
} }
} }