Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-16 00:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r17930) -Fix (r17926): Aircraft were not carrying mail anymore, when CB15 was in use.

Browse Source
This commit is contained in:
frosch 2009-11-01 08:48:16 +00:00
parent 2d5aebb1f1
commit 3a95e115fc
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/vehicle.cpp
View File

@ -1387,6 +1387,9 @@ uint GetVehicleCapacity(const Vehicle *v, uint16 *mail_capacity)
if (!e->CanCarryCargo()) return 0; if (!e->CanCarryCargo()) return 0;
if (mail_capacity != NULL && e->type == VEH_AIRCRAFT && IsCargoInClass(v->cargo_type, CC_PASSENGERS)) {
*mail_capacity = e->u.air.mail_capacity;
}
CargoID default_cargo = e->GetDefaultCargoType(); CargoID default_cargo = e->GetDefaultCargoType();
/* Check the refit capacity callback if we are not in the default configuration. /* Check the refit capacity callback if we are not in the default configuration.
@ -1411,9 +1414,7 @@ uint GetVehicleCapacity(const Vehicle *v, uint16 *mail_capacity)
* Note: This might change to become more consistent/flexible. */ * Note: This might change to become more consistent/flexible. */
if (e->type != VEH_SHIP) { if (e->type != VEH_SHIP) {
if (e->type == VEH_AIRCRAFT) { if (e->type == VEH_AIRCRAFT) {
if (IsCargoInClass(v->cargo_type, CT_PASSENGERS)) { if (!IsCargoInClass(v->cargo_type, CT_PASSENGERS)) {
if (mail_capacity != NULL) *mail_capacity = e->u.air.mail_capacity;
} else {
capacity += e->u.air.mail_capacity; capacity += e->u.air.mail_capacity;
} }
if (v->cargo_type == CT_MAIL) return capacity; if (v->cargo_type == CT_MAIL) return capacity;