diff options
| author | terkhen <terkhen@openttd.org> | 2010-01-28 20:54:29 +0000 |
|---|---|---|
| committer | terkhen <terkhen@openttd.org> | 2010-01-28 20:54:29 +0000 |
| commit | d4376779f843b1310a3e0c9a527f1a23698954ab (patch) | |
| tree | fb14ad6b5ce1729913417f243ab98ac9d07966d3 | |
| parent | 294bc146522ea305745889f123ed7debf8364f5d (diff) | |
| download | openttd-d4376779f843b1310a3e0c9a527f1a23698954ab.tar.xz | |
(svn r18939) -Codechange [FS#3545]: Move train slope steepness to its own function.
| -rw-r--r-- | src/train.h | 9 | ||||
| -rw-r--r-- | src/train_cmd.cpp | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/train.h b/src/train.h index f61febf0c..d7b583ee3 100644 --- a/src/train.h +++ b/src/train.h @@ -494,6 +494,15 @@ protected: /* These functions should not be called outside acceleration code. */ { 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) diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp index a1c9d51d2..f2c2e4d37 100644 --- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -139,7 +139,7 @@ void Train::CargoChanged() for (Train *u = this; u != NULL; u = u->Next()) { uint32 current_weight = u->GetWeight(); 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 */ |