Mercurial > hg > openttd
changeset 20726:648c12a70f7a draft
(svn r25640) -Fix: Do not suggest a start date for the game when there will be no vehicles available at all.
| author | alberth <alberth@openttd.org> |
|---|---|
| date | Wed, 31 Jul 2013 07:30:18 +0000 |
| parents | fec842671605 |
| children | 60958335fe0f |
| files | src/engine.cpp src/lang/english.txt |
| diffstat | 2 files changed, 9 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/engine.cpp +++ b/src/engine.cpp @@ -1112,12 +1112,16 @@ if (!e->IsEnabled()) continue; /* We have an available engine... yay! */ - if (e->flags & ENGINE_AVAILABLE && e->company_avail != 0) return; + if ((e->flags & ENGINE_AVAILABLE) != 0 && e->company_avail != 0) return; /* Okay, try to find the earliest date. */ min_date = min(min_date, e->info.base_intro); } - SetDParam(0, min_date); - ShowErrorMessage(STR_ERROR_NO_VEHICLES_AVAILABLE_YET, STR_ERROR_NO_VEHICLES_AVAILABLE_YET_EXPLANATION, WL_WARNING); + if (min_date < INT32_MAX) { + SetDParam(0, min_date); + ShowErrorMessage(STR_ERROR_NO_VEHICLES_AVAILABLE_YET, STR_ERROR_NO_VEHICLES_AVAILABLE_YET_EXPLANATION, WL_WARNING); + } else { + ShowErrorMessage(STR_ERROR_NO_VEHICLES_AVAILABLE_AT_ALL, STR_ERROR_NO_VEHICLES_AVAILABLE_AT_ALL_EXPLANATION, WL_WARNING); + } }
--- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -4316,6 +4316,8 @@ STR_ERROR_VEHICLE_IS_DESTROYED :{WHITE}... vehicle is destroyed +STR_ERROR_NO_VEHICLES_AVAILABLE_AT_ALL :{WHITE}No vehicles will be available at all +STR_ERROR_NO_VEHICLES_AVAILABLE_AT_ALL_EXPLANATION :{WHITE}Change your NewGRF configuration STR_ERROR_NO_VEHICLES_AVAILABLE_YET :{WHITE}No vehicles are available yet STR_ERROR_NO_VEHICLES_AVAILABLE_YET_EXPLANATION :{WHITE}Start a new game after {DATE_SHORT} or use a NewGRF that provides early vehicles