mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

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

release/0.7
rubidium 2008-04-18 17:53:06 +00:00
parent 7edc9b65c6
commit fb466f4db2
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/vehicle.cpp
View File

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