diff options
| author | alberth <alberth@openttd.org> | 2010-11-20 15:44:24 +0000 |
|---|---|---|
| committer | alberth <alberth@openttd.org> | 2010-11-20 15:44:24 +0000 |
| commit | ab50f74d7fa3c1c96de54012ccc197c4800901c8 (patch) | |
| tree | fbee322b7dcec81c6a98a1ee923984d902e834f9 /src/newgrf_object.cpp | |
| parent | 38dc34828ea679e4952f9f30361382e29d2f2e06 (diff) | |
| download | openttd-ab50f74d7fa3c1c96de54012ccc197c4800901c8.tar.xz | |
(svn r21273) -Codechange: Return values should start at the same line.
Diffstat (limited to 'src/newgrf_object.cpp')
| -rw-r--r-- | src/newgrf_object.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/newgrf_object.cpp b/src/newgrf_object.cpp index 3215d1888..b27f4c564 100644 --- a/src/newgrf_object.cpp +++ b/src/newgrf_object.cpp @@ -48,9 +48,7 @@ ObjectSpec _object_specs[NUM_OBJECTS]; bool ObjectSpec::IsAvailable() const { - return - this->enabled && - _date > this->introduction_date && + return this->enabled && _date > this->introduction_date && (_date < this->end_of_life_date || this->end_of_life_date < this->introduction_date + 365) && HasBit(this->climate, _settings_game.game_creation.landscape) && (flags & (_game_mode != GM_EDITOR ? OBJECT_FLAG_ONLY_IN_SCENEDIT : OBJECT_FLAG_ONLY_IN_GAME)) == 0; |