mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r18939) -Codechange [FS#3545]: Move train slope steepness to its own function.

release/1.0
terkhen 2010-01-28 20:54:29 +00:00
parent 294bc14652
commit d4376779f8
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/train.h
View File

@ -494,6 +494,15 @@ protected: /* These functions should not be called outside acceleration code. */
{ {
return GetRailTypeInfo(this->railtype)->acceleration_type; return GetRailTypeInfo(this->railtype)->acceleration_type;
} }
/**
* Returns the slope steepness used by this vehicle.
* @return Slope steepness used by the vehicle.
*/
FORCEINLINE uint32 GetSlopeSteepness() const
{
return 20 * _settings_game.vehicle.train_slope_steepness; // 1% slope * slope steepness
}
}; };
#define FOR_ALL_TRAINS(var) FOR_ALL_VEHICLES_OF_TYPE(Train, var) #define FOR_ALL_TRAINS(var) FOR_ALL_VEHICLES_OF_TYPE(Train, var)

2
src/train_cmd.cpp
View File

@ -139,7 +139,7 @@ void Train::CargoChanged()
for (Train *u = this; u != NULL; u = u->Next()) { for (Train *u = this; u != NULL; u = u->Next()) {
uint32 current_weight = u->GetWeight(); uint32 current_weight = u->GetWeight();
weight += current_weight; weight += current_weight;
u->tcache.cached_slope_resistance = current_weight * 20 * _settings_game.vehicle.train_slope_steepness; //1% slope * slope steepness u->tcache.cached_slope_resistance = current_weight * u->GetSlopeSteepness();
} }
/* store consist weight in cache */ /* store consist weight in cache */