gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-09 23:50:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r20299) -Add: Make trains and road vehicles use a different area value to calculate air drag.

Browse Source
This commit is contained in:
terkhen 2010-08-02 14:49:23 +00:00
parent 14d58e9978
commit 1fd66d7cc4
4 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ground_vehicle.cpp
View File

@ -107,7 +107,7 @@ int GroundVehicle<T, Type>::GetAcceleration() const
bool maglev = v->GetAccelerationType() == 2;
const int area = 120;
const int area = v->GetAirDragArea();
if (!maglev) {
resistance = (13 * mass) / 10;
resistance += this->acc_cache.cached_axle_resistance;

1
src/ground_vehicle.hpp
View File

@ -54,6 +54,7 @@ enum GroundVehicleFlags {
* virtual uint16 GetPoweredPartPower(const T *head) const = 0;
* virtual uint16 GetWeight() const = 0;
* virtual byte GetTractiveEffort() const = 0;
* virtual byte GetAirDragArea() const = 0;
* virtual AccelStatus GetAccelerationStatus() const = 0;
* virtual uint16 GetCurrentSpeed() const = 0;
* virtual uint32 GetRollingFriction() const = 0;

9
src/roadveh.h
View File

@ -210,6 +210,15 @@ protected: // These functions should not be called outside acceleration code.
return RoadVehInfo(this->engine_type)->tractive_effort;
}
/**
* Gets the area used for calculating air drag.
* @return Area of the engine.
*/
FORCEINLINE byte GetAirDragArea() const
{
return 60;
}
/**
* Checks the current acceleration status of this vehicle.
* @return Acceleration status.

9
src/train.h
View File

@ -432,6 +432,15 @@ protected: // These functions should not be called outside acceleration code.
return GetVehicleProperty(this, PROP_TRAIN_TRACTIVE_EFFORT, RailVehInfo(this->engine_type)->tractive_effort);
}
/**
* Gets the area used for calculating air drag.
* @return Area of the engine.
*/
FORCEINLINE byte GetAirDragArea() const
{
return 120;
}
/**
* Checks the current acceleration status of this vehicle.
* @return Acceleration status.