mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r14755) -Codechange: remove ending year as it can't be changed anyways.

This commit is contained in:
rubidium 2008-12-28 16:09:58 +00:00
parent 87e5a8b52b
commit 683b65ee18
8 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/company_cmd.cpp
View File

@ -1092,9 +1092,6 @@ void LoadFromHighScore()
}
fclose(fp);
}
/* Initialize end of game variable (when to show highscore chart) */
_settings_client.gui.ending_year = 2051;
}
/* Save/load of companies */

2
src/company_gui.cpp
View File

@ -1542,7 +1542,7 @@ struct HighScoreWindow : EndGameHighScoreBaseWindow
this->SetupHighScoreEndWindow(&x, &y);
SetDParam(0, _settings_client.gui.ending_year);
SetDParam(0, ORIGINAL_END_YEAR);
SetDParam(1, this->window_number + STR_6801_EASY);
DrawStringMultiCenter(x + (640 / 2), y + 62, !_networking ? STR_0211_TOP_COMPANIES_WHO_REACHED : STR_TOP_COMPANIES_NETWORK_GAME, 500);

4
src/date.cpp
View File

@ -284,8 +284,8 @@ void IncreaseDate()
if (_cur_year == _settings_client.gui.semaphore_build_before) ResetSignalVariant();
/* check if we reached end of the game */
if (_cur_year == _settings_client.gui.ending_year) {
ShowEndGameChart();
if (_cur_year == ORIGINAL_END_YEAR) {
ShowEndGameChart();
/* check if we reached the maximum year, decrement dates by a year */
} else if (_cur_year == MAX_YEAR + 1) {
Vehicle *v;

2
src/date_type.h
View File

@ -22,6 +22,8 @@
/** The minimum starting year/base year of the original TTD */
#define ORIGINAL_BASE_YEAR 1920
/** The original ending year */
#define ORIGINAL_END_YEAR 2051
/** The maximum year of the original TTD */
#define ORIGINAL_MAX_YEAR 2090

1
src/lang/english.txt
View File

@ -1175,7 +1175,6 @@ STR_CONFIG_PATCHES_DISABLE_ELRAILS :{LTBLUE}Disable
STR_CONFIG_PATCHES_COLORED_NEWS_YEAR :{LTBLUE}Coloured news appears in: {ORANGE}{STRING1}
STR_CONFIG_PATCHES_STARTING_YEAR :{LTBLUE}Starting year: {ORANGE}{STRING1}
STR_CONFIG_PATCHES_ENDING_YEAR :{LTBLUE}End game in: {ORANGE}{STRING1}
STR_CONFIG_PATCHES_SMOOTH_ECONOMY :{LTBLUE}Enable smooth economy (more, smaller changes)
STR_CONFIG_PATCHES_ALLOW_SHARES :{LTBLUE}Allow buying shares from other companies
STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY :{LTBLUE}When dragging, place signals every: {ORANGE}{STRING1} tile(s)

3
src/settings.cpp
View File

@ -363,6 +363,7 @@ static void Write_ValidateSetting(void *ptr, const SettingDesc *sd, int32 val)
* 32-bit variable
* TODO: Support 64-bit settings/variables */
switch (GetVarMemType(sd->save.conv)) {
case SLE_VAR_NULL: return;
case SLE_VAR_BL:
case SLE_VAR_I8:
case SLE_VAR_U8:
@ -1325,7 +1326,7 @@ const SettingDesc _patch_settings[] = {
SDT_VAR(GameSettings, game_creation.snow_line_height, SLE_UINT8, 0, 0, 7, 2, 13, 0, STR_CONFIG_PATCHES_SNOWLINE_HEIGHT, NULL),
SDTC_VAR( gui.colored_news_year, SLE_INT32, 0,NC, 2000,MIN_YEAR,MAX_YEAR,1,STR_CONFIG_PATCHES_COLORED_NEWS_YEAR, NULL),
SDT_VAR(GameSettings, game_creation.starting_year, SLE_INT32, 0,NC, 1950,MIN_YEAR,MAX_YEAR,1,STR_CONFIG_PATCHES_STARTING_YEAR, NULL),
SDTC_VAR( gui.ending_year, SLE_INT32, 0,NC|NO,2051,MIN_YEAR,MAX_YEAR,1,STR_CONFIG_PATCHES_ENDING_YEAR, NULL),
SDT_CONDNULL( 4, 0, 104),
SDT_BOOL(GameSettings, economy.smooth_economy, 0, 0, true, STR_CONFIG_PATCHES_SMOOTH_ECONOMY, NULL),
SDT_BOOL(GameSettings, economy.allow_shares, 0, 0, false, STR_CONFIG_PATCHES_ALLOW_SHARES, NULL),
SDT_CONDVAR(GameSettings, economy.town_growth_rate, SLE_UINT8, 54, SL_MAX_VERSION, 0, MS, 2, 0, 4, 0, STR_CONFIG_PATCHES_TOWN_GROWTH, NULL),

1
src/settings_gui.cpp
View File

@ -655,7 +655,6 @@ static const char *_patches_economy[] = {
"economy.exclusive_rights",
"economy.give_money",
"gui.colored_news_year",
"gui.ending_year",
"economy.smooth_economy",
"economy.allow_shares",
"economy.town_layout",

1
src/settings_type.h
View File

@ -68,7 +68,6 @@ struct GUISettings {
uint8 scrollwheel_multiplier; ///< how much 'wheel' per incoming event from the OS?
bool pause_on_newgame; ///< whether to start new games paused or not
bool enable_signal_gui; ///< show the signal GUI when the signal button is pressed
Year ending_year; ///< end of the game (just show highscore)
Year colored_news_year; ///< when does newspaper become colored?
bool timetable_in_ticks; ///< whether to show the timetable in ticks rather than days
bool bridge_pillars; ///< show bridge pillars for high bridges