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

Fix brakes overheated breakdown triggering only with a lower advisory max speed

Browse Source
This commit is contained in:
Jonathan G Rennison 2021-04-11 23:44:14 +01:00
parent d484c32d44
commit 49d7afe7ae
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/ground_vehicle.hpp
View File

@ -476,12 +476,7 @@ protected:
tempmax = std::max(this->cur_speed - (this->cur_speed / 10) - 1, max_speed);
}
/* Enforce a maximum and minimum speed. Normally we would use something like
* Clamp for this, but in this case min_speed might be below the maximum speed
* threshold for some reason. That makes acceleration fail and assertions
* happen in Clamp. So make it explicit that min_speed overrules the maximum
* speed by explicit ordering of min and max. */
int tempspeed = std::min(this->cur_speed + ((int)spd >> 8), tempmax);
int tempspeed = this->cur_speed + ((int)spd >> 8);
if (Type == VEH_TRAIN && _settings_game.vehicle.train_braking_model == TBM_REALISTIC && tempspeed > advisory_max_speed && accel.braking != accel.acceleration) {
spd = initial_subspeed + accel.braking;
@ -504,6 +499,13 @@ protected:
}
}
/* Enforce a maximum and minimum speed. Normally we would use something like
* Clamp for this, but in this case min_speed might be below the maximum speed
* threshold for some reason. That makes acceleration fail and assertions
* happen in Clamp. So make it explicit that min_speed overrules the maximum
* speed by explicit ordering of min and max. */
tempspeed = std::min(tempspeed, tempmax);
this->cur_speed = std::max(tempspeed, min_speed);
int scaled_spd = this->GetAdvanceSpeed(this->cur_speed);