cpp/openttd-patchpack/source Changeset - r5314:291027c28616

Changeset - r5314:291027c28616

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

Darkvater - 17 years ago 2006-12-10 15:21:48
darkvater@openttd.org

(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.

2 files changed with 6 insertions and 13 deletions:

elrail.c

openttd.c

0 comments (0 inline, 0 general)

elrail.c

➞

Show inline comments

@@ @@ -403,8 +403,7 @@ int32 SettingsDisableElrail(int32 p1) @@
 	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 */

openttd.c

➞

Show inline comments

@@ @@ -1548,19 +1548,13 @@ bool AfterLoadGame(void) @@
 		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;
+}

0 comments (0 inline, 0 general)