cpp/openttd-patchpack/source Changeset - r8169:954f67fb52e7

Changeset - r8169:954f67fb52e7

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

peter1138 - 17 years ago 2008-01-01 14:00:31
peter1138@openttd.org

(svn r11732) -Fix (r4150): elrail merge gave elrail, monorail & maglev unintended speed bonuses for curves, as the bonus was based on the railtype index. The bonus is now specified by a property of the railtype.

3 files changed with 25 insertions and 3 deletions:

src/rail.h

src/railtypes.h

src/train_cmd.cpp

0 comments (0 inline, 0 general)

src/rail.h

➞

Show inline comments

@@ @@ -89,6 +89,11 @@ struct RailtypeInfo { @@
 	 * Offset to add to ground sprite when drawing custom waypoints / stations
 	 */
 	byte custom_ground_offset;
 	/**
 	 * Multiplier for curve maximum speed advantage
 	 */
 	byte curve_speed;
 };

src/railtypes.h

➞

Show inline comments

@@ @@ -57,6 +57,9 @@ RailtypeInfo _railtypes[] = { @@
 		/* custom ground offset */
 ,
 		/* curve speed advantage (multiplier) */
 ,
 	},
 	/** Electrified railway */
@@ @@ -110,6 +113,9 @@ RailtypeInfo _railtypes[] = { @@
 		/* custom ground offset */
 ,
 		/* curve speed advantage (multiplier) */
 ,
 	},
 	/** Monorail */
@@ @@ -159,6 +165,9 @@ RailtypeInfo _railtypes[] = { @@
 		/* custom ground offset */
 ,
 		/* curve speed advantage (multiplier) */
 ,
 	},
 	/** Maglev */
@@ @@ -208,6 +217,9 @@ RailtypeInfo _railtypes[] = { @@
 		/* custom ground offset */
 ,
 		/* curve speed advantage (multiplier) */
 ,
 	},
 };

src/train_cmd.cpp

➞

Show inline comments

@@ @@ -311,7 +311,8 @@ static bool TrainShouldStop(const Vehicl @@
 /** new acceleration*/
 static int GetTrainAcceleration(Vehicle *v, bool mode)
+{
 	int max_speed = 2000;
 	static const int absolute_max_speed = 2000;
 	int max_speed = absolute_max_speed;
 	int speed = v->cur_speed * 10 / 16; // km-ish/h -> mp/h
 	int curvecount[2] = {0, 0};
@@ @@ -352,13 +353,17 @@ static int GetTrainAcceleration(Vehicle @@
 		int total = curvecount[0] + curvecount[1];
 		if (curvecount[0] == 1 && curvecount[1] == 1) {
-			max_speed = 0xFFFF;
+			max_speed = absolute_max_speed;
 		} else if (total > 1) {
 			max_speed = 232 - (13 - Clamp(sum, 1, 12)) * (13 - Clamp(sum, 1, 12));
+		}
+	}
 	max_speed += (max_speed / 2) * v->u.rail.railtype;
 	if (max_speed != absolute_max_speed) {
 		/* Apply the engine's rail type curve speed advantage, if it slowed by curves */
 		const RailtypeInfo *rti = GetRailTypeInfo(v->u.rail.railtype);
 		max_speed += (max_speed / 2) * rti->curve_speed;
+	}
 	if (IsTileType(v->tile, MP_STATION) && IsFrontEngine(v)) {
 		if (TrainShouldStop(v, v->tile)) {

0 comments (0 inline, 0 general)