Mercurial > hg > openttd
changeset 5314:834d4c90014e draft
(svn r7470) -Codechange: Leave elrails enabled after loading old (pre-optional) and very old (pre-elrails) games. Let the user manually disable if if undesired.
author | Darkvater <Darkvater@openttd.org> |
---|---|
date | Sun, 10 Dec 2006 15:21:48 +0000 |
parents | f91cdcdf3756 |
children | ab9c5d591ea9 |
files | elrail.c openttd.c |
diffstat | 2 files changed, 6 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/elrail.c +++ b/elrail.c @@ -403,8 +403,7 @@ const RailType new_railtype = disable ? RAILTYPE_RAIL : RAILTYPE_ELECTRIC; /* walk through all train engines */ - for (e_id = 0; e_id < NUM_TRAIN_ENGINES; e_id++) - { + for (e_id = 0; e_id < NUM_TRAIN_ENGINES; e_id++) { const RailVehicleInfo *rv_info = RailVehInfo(e_id); Engine *e = GetEngine(e_id); /* if it is an electric rail engine and its railtype is the wrong one */
--- a/openttd.c +++ b/openttd.c @@ -1548,19 +1548,13 @@ ConvertNameArray(); } - /* from version 38 we have optional elrails */ + /* from version 38 we have optional elrails, since we cannot know the + * preference of a user, let elrails enabled; it can be disabled manually */ if (CheckSavegameVersion(38)) { - /* old game - before elrails made optional */ - if (CheckSavegameVersion(24)) { - /* very old game - before elrail was introduced */ - _patches.disable_elrails = true; // disable elrails - } else { - /* game with mandatory elrails (r4150+) */ - _patches.disable_elrails = false; // enable elrails - } + _patches.disable_elrails = false; // enable elrails + /* do the same as when elrails were enabled/disabled manually just now */ + SettingsDisableElrail(_patches.disable_elrails); } - /* do the same as when elrails were enabled/disabled manually just now */ - SettingsDisableElrail(_patches.disable_elrails); return true; }