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

Implement improved breakdown speed reductions for ships

Browse Source
This commit is contained in:
Jonathan G Rennison
2021-09-11 23:50:04 +01:00
parent 282f5f22e3
commit 0748d540e8
7 changed files with 36 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/vehicle.cpp
View File

@@ -194,6 +194,8 @@ void VehicleServiceInDepot(Vehicle *v)
}
} else if (v->type == VEH_ROAD) {
RoadVehicle::From(v)->critical_breakdown_count = 0;
} else if (v->type == VEH_SHIP) {
Ship::From(v)->critical_breakdown_count = 0;
}
v->vehstatus &= ~VS_AIRCRAFT_BROKEN;
SetWindowDirty(WC_VEHICLE_DETAILS, v->index); // ensure that last service date and reliability are updated
@@ -231,7 +233,8 @@ bool Vehicle::NeedsServicing() const
(this->reliability >= this->GetEngine()->reliability * (100 - this->service_interval) / 100) :
(this->date_of_last_service + this->service_interval >= _date))
&& !(this->type == VEH_TRAIN && HasBit(Train::From(this)->flags, VRF_NEED_REPAIR))
&& !(this->type == VEH_ROAD && RoadVehicle::From(this)->critical_breakdown_count > 0)) {
&& !(this->type == VEH_ROAD && RoadVehicle::From(this)->critical_breakdown_count > 0)
&& !(this->type == VEH_SHIP && Ship::From(this)->critical_breakdown_count > 0)) {
return false;
}
@@ -2205,6 +2208,10 @@ bool Vehicle::HandleBreakdown()
if (RoadVehicle::From(this)->critical_breakdown_count != 255) {
RoadVehicle::From(this)->critical_breakdown_count++;
}
} else if (this->type == VEH_SHIP) {
if (Ship::From(this)->critical_breakdown_count != 255) {
Ship::From(this)->critical_breakdown_count++;
}
}
}
/* FALL THROUGH */