gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-13 02:52:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r25479) -Fix (r23861): [NewGRF] When cargo NewGRF define a mulitplier to modify vehicle capacities, use the same multiplier to modify loading speed.

Browse Source
This commit is contained in:
frosch 2013-06-26 20:38:32 +00:00
parent 653a005d19
commit 7c9f0545b4
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/economy.cpp
View File

@ -1255,13 +1255,14 @@ void PrepareUnload(Vehicle *front_v)
* @param v Vehicle to be queried. * @param v Vehicle to be queried.
* @return Amount of cargo the vehicle can load at once. * @return Amount of cargo the vehicle can load at once.
*/ */
static byte GetLoadAmount(Vehicle *v) static uint GetLoadAmount(Vehicle *v)
{ {
const Engine *e = v->GetEngine(); const Engine *e = v->GetEngine();
byte load_amount = e->info.load_amount; byte load_amount = e->info.load_amount;
/* The default loadamount for mail is 1/4 of the load amount for passengers */ /* The default loadamount for mail is 1/4 of the load amount for passengers */
if (v->type == VEH_AIRCRAFT && !Aircraft::From(v)->IsNormalAircraft()) load_amount = CeilDiv(load_amount, 4); bool air_mail = v->type == VEH_AIRCRAFT && !Aircraft::From(v)->IsNormalAircraft();
if (air_mail) load_amount = CeilDiv(load_amount, 4);
if (_settings_game.order.gradual_loading) { if (_settings_game.order.gradual_loading) {
uint16 cb_load_amount = CALLBACK_FAILED; uint16 cb_load_amount = CALLBACK_FAILED;
@ -1281,6 +1282,10 @@ static byte GetLoadAmount(Vehicle *v)
} }
} }
} }
/* Scale load amount the same as capacity */
if (HasBit(e->info.misc_flags, EF_NO_DEFAULT_CARGO_MULTIPLIER) && !air_mail) load_amount = CeilDiv(load_amount * CargoSpec::Get(v->cargo_type)->multiplier, 0x100);
return load_amount; return load_amount;
} }
@ -1401,7 +1406,7 @@ static void LoadUnloadVehicle(Vehicle *front)
if (v->cargo_cap == 0) continue; if (v->cargo_cap == 0) continue;
artic_part++; artic_part++;
byte load_amount = GetLoadAmount(v); uint load_amount = GetLoadAmount(v);
GoodsEntry *ge = &st->goods[v->cargo_type]; GoodsEntry *ge = &st->goods[v->cargo_type];