petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r21273) -Codechange: Return values should start at the same line.

Browse Source
This commit is contained in:
alberth
2010-11-20 15:44:24 +00:00
parent 38dc34828e
commit ab50f74d7f
16 changed files with 55 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/newgrf_object.cpp
View File

@@ -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;