mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r21997) -Fix [FS#4473]: when the difference between force and resistance is smaller than the mass(*4) there would be no acceleration anymore, even when at higher (or lower) speed the force and resistance balance out better

This commit is contained in:
rubidium 2011-02-06 16:45:27 +00:00
parent fd94ed3009
commit fd86b0608d
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ground_vehicle.cpp
View File

@ -151,8 +151,16 @@ int GroundVehicle<T, Type>::GetAcceleration() const
}
if (mode == AS_ACCEL) {
/* Divide by 4 to compensate for the wacky game scale. */
return (force - resistance) / (mass * 4);
/* Easy way out when there is no acceleration. */
if (force == resistance) return 0;
/* When we accelerate, make sure we always keep doing that, even when
* the excess force is more than the mass. Otherwise a vehicle going
* down hill will never slow down enough, and a vehicle that came up
* a hill will never speed up enough to (eventually) get back to the
* same (maximum) speed. */
int accel = (force - resistance) / (mass * 4);
return force < resistance ? min(-1, accel) : max(1, accel);
} else {
return min(-force - resistance, -10000) / mass;
}