mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r9303) -Codechange: Use cargo class when counting passengers in a road vehicle crash, and when loading aircraft.

release/0.6
peter1138 2007-03-18 22:32:05 +00:00
parent 8ef0e43b94
commit ae48a7447b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/roadveh_cmd.cpp
View File

@ -596,7 +596,7 @@ static void RoadVehCrash(Vehicle *v)
InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR);
pass = 1; pass = 1;
if (v->cargo_type == CT_PASSENGERS) pass += v->cargo_count; if (IsCargoInClass(v->cargo_type, CC_PASSENGERS)) pass += v->cargo_count;
v->cargo_count = 0; v->cargo_count = 0;
SetDParam(0, pass); SetDParam(0, pass);

2
src/vehicle.cpp
View File

@ -700,7 +700,7 @@ static bool CanFillVehicle_FullLoadAny(Vehicle *v)
//if the aircraft carries passengers and is NOT full, then //if the aircraft carries passengers and is NOT full, then
//continue loading, no matter how much mail is in //continue loading, no matter how much mail is in
if (v->type == VEH_AIRCRAFT && if (v->type == VEH_AIRCRAFT &&
v->cargo_type == CT_PASSENGERS && IsCargoInClass(v->cargo_type, CC_PASSENGERS) &&
v->cargo_cap != v->cargo_count) { v->cargo_cap != v->cargo_count) {
return true; return true;
} }