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

Merge branch 'improved_breakdowns-sx' into jgrpp

Browse Source 
Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/saveload/vehicle_sl.cpp
	src/settings_type.h
This commit is contained in:
Jonathan G Rennison
2016-01-18 23:09:17 +00:00
parent 7169b1ff4c 1678415aff
commit b43962f0bd
6 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/vehicle.cpp
View File

@@ -106,6 +106,7 @@ void VehicleServiceInDepot(Vehicle *v)
if (v->Next() != NULL) VehicleServiceInDepot(v->Next());
if (!(Train::From(v)->IsEngine()) && !(Train::From(v)->IsRearDualheaded())) return;
ClrBit(Train::From(v)->flags,VRF_NEED_REPAIR);
Train::From(v)->critical_breakdown_count = 0;
const RailVehicleInfo *rvi = &e->u.rail;
v->vcache.cached_max_speed = rvi->max_speed;
if (Train::From(v)->IsFrontEngine()) {
@@ -1469,17 +1470,12 @@ bool Vehicle::HandleBreakdown()
}
/* Max Speed reduction*/
if (_settings_game.vehicle.improved_breakdowns) {
const Engine *e = Engine::Get(this->engine_type);
const RailVehicleInfo *rvi = &e->u.rail;
if (!HasBit(Train::From(this)->flags,VRF_NEED_REPAIR)) {
if (rvi->max_speed > this->vcache.cached_max_speed) {
this->vcache.cached_max_speed = rvi->max_speed;
}
if (!HasBit(Train::From(this)->flags, VRF_NEED_REPAIR)) {
SetBit(Train::From(this)->flags, VRF_NEED_REPAIR);
Train::From(this)->critical_breakdown_count = 1;
} else if (Train::From(this)->critical_breakdown_count != 255) {
Train::From(this)->critical_breakdown_count++;
}
uint16 target_max_speed = min(this->vcache.cached_max_speed -
(this->vcache.cached_max_speed >> 1) / Train::From(this->First())->tcache.cached_num_engines + 1, this->vcache.cached_max_speed);
this->vcache.cached_max_speed = max(target_max_speed, min<uint16>(rvi->max_speed / 4, 28));
SetBit(Train::From(this)->flags, VRF_NEED_REPAIR);
Train::From(this->First())->ConsistChanged(CCF_TRACK);
}
/* FALL THROUGH */