cpp/openttd-patchpack/source Changeset - r8980:35a4e999d3c2

Changeset - r8980:35a4e999d3c2

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

rubidium - 16 years ago 2008-04-18 17:53:06
rubidium@openttd.org

(svn r12772) -Codechange: some vehicle.cpp coding style.

1 file changed with 4 insertions and 9 deletions:

src/vehicle.cpp

0 comments (0 inline, 0 general)

src/vehicle.cpp

➞

Show inline comments

@@ @@ -835,11 +835,9 @@ static void ChimneySmokeTick(Vehicle *v) @@
 	if (v->progress > 0) {
 		v->progress--;
 	} else {
 		TileIndex tile;
 		BeginVehicleMove(v);
 		tile = TileVirtXY(v->x_pos, v->y_pos);
+		TileIndex tile = TileVirtXY(v->x_pos, v->y_pos);
 		if (!IsTileType(tile, MP_INDUSTRY)) {
 			EndVehicleMove(v);
 			delete v;
@@ @@ -1487,10 +1485,10 @@ void CheckVehicleBreakdown(Vehicle *v) @@
 	/* decrease reliability */
 	v->reliability = rel = max((rel_old = v->reliability) - v->reliability_spd_dec, 0);
 	if ((rel_old >> 8) != (rel >> 8))
 		InvalidateWindow(WC_VEHICLE_DETAILS, v->index);
 	if ((rel_old >> 8) != (rel >> 8)) InvalidateWindow(WC_VEHICLE_DETAILS, v->index);
 	if (v->breakdown_ctr != 0 || v->vehstatus & VS_STOPPED ||
 			_opt.diff.vehicle_breakdowns < 1 ||
 			v->cur_speed < 5 || _game_mode == GM_MENU) {
 		return;
+	}
@@ @@ -1499,16 +1497,13 @@ void CheckVehicleBreakdown(Vehicle *v) @@
 	/* increase chance of failure */
 	int chance = v->breakdown_chance + 1;
 	if (Chance16I(1,25,r)) chance += 25;
+	if (Chance16I(1, 25, r)) chance += 25;
 	v->breakdown_chance = min(255, chance);
 	/* calculate reliability value to use in comparison */
 	rel = v->reliability;
 	if (v->type == VEH_SHIP) rel += 0x6666;
 	/* disabled breakdowns? */
 	if (_opt.diff.vehicle_breakdowns < 1) return;
 	/* reduced breakdowns? */
 	if (_opt.diff.vehicle_breakdowns == 1) rel += 0x6666;

0 comments (0 inline, 0 general)