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

Adjust handling of vehicle subspeed with realistic braking

Browse Source 
In particular when descending a steep slope with insufficient braking
This commit is contained in:
Jonathan G Rennison
2024-05-18 19:34:39 +01:00
parent 6d1f3b673e
commit 66d03530dc
1 changed files with 17 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/ground_vehicle.hpp
View File

@@ -439,11 +439,12 @@ protected:
*/ */
inline uint DoUpdateSpeed(GroundVehicleAcceleration accel, int min_speed, int max_speed, int advisory_max_speed, bool use_realistic_braking) inline uint DoUpdateSpeed(GroundVehicleAcceleration accel, int min_speed, int max_speed, int advisory_max_speed, bool use_realistic_braking)
{ {
const uint8_t initial_subspeed = this->subspeed; int new_subspeed = ((int)this->subspeed + accel.acceleration) + (this->cur_speed << 8);
uint spd = this->subspeed + accel.acceleration; int new_lb_subspeed = 0;
this->subspeed = (uint8_t)spd;
if (!use_realistic_braking) { if (use_realistic_braking) {
new_lb_subspeed = ((int)this->subspeed + accel.braking) + (this->cur_speed << 8);
} else {
max_speed = std::min(max_speed, advisory_max_speed); max_speed = std::min(max_speed, advisory_max_speed);
} }
@@ -475,26 +476,15 @@ protected:
tempmax = std::max(this->cur_speed - (this->cur_speed / 10) - 1, max_speed); tempmax = std::max(this->cur_speed - (this->cur_speed / 10) - 1, max_speed);
} }
int tempspeed = this->cur_speed + ((int)spd >> 8); if (use_realistic_braking && new_subspeed > (advisory_max_speed << 8) && new_lb_subspeed < new_subspeed) {
new_subspeed = Clamp(advisory_max_speed << 8, new_lb_subspeed, new_subspeed);
if (use_realistic_braking && tempspeed > advisory_max_speed && accel.braking != accel.acceleration) { if ((new_subspeed >> 8) > tempmax) {
spd = initial_subspeed + accel.braking; if (use_realistic_braking && accel.braking >= 0) {
int braking_speed = this->cur_speed + ((int)spd >> 8); extern void TrainBrakesOverheatedBreakdown(Vehicle *v);
if (braking_speed >= advisory_max_speed) { TrainBrakesOverheatedBreakdown(this);
if (braking_speed > tempmax) {
if (use_realistic_braking && accel.braking >= 0) {
extern void TrainBrakesOverheatedBreakdown(Vehicle *v);
TrainBrakesOverheatedBreakdown(this);
}
tempspeed = tempmax;
this->subspeed = 0;
} else {
tempspeed = braking_speed;
this->subspeed = (uint8_t)spd;
} }
} else { new_subspeed = tempmax << 8;
tempspeed = advisory_max_speed;
this->subspeed = 0;
} }
} }
@@ -503,9 +493,12 @@ protected:
* threshold for some reason. That makes acceleration fail and assertions * threshold for some reason. That makes acceleration fail and assertions
* happen in Clamp. So make it explicit that min_speed overrules the maximum * happen in Clamp. So make it explicit that min_speed overrules the maximum
* speed by explicit ordering of min and max. */ * speed by explicit ordering of min and max. */
tempspeed = std::min(tempspeed, tempmax); new_subspeed = std::min(new_subspeed, (tempmax << 8) + 255);
this->cur_speed = std::max(tempspeed, min_speed); new_subspeed = std::max(new_subspeed, min_speed << 8);
this->cur_speed = new_subspeed >> 8;
this->subspeed = (uint8_t)new_subspeed;
int scaled_spd = this->GetAdvanceSpeed(this->cur_speed); int scaled_spd = this->GetAdvanceSpeed(this->cur_speed);