equal
deleted
inserted
replaced
141 for (i = 0; i < NUM_TRAIN_ENGINES; i++) { |
141 for (i = 0; i < NUM_TRAIN_ENGINES; i++) { |
142 const RailVehicleInfo *rvi = RailVehInfo(i); |
142 const RailVehicleInfo *rvi = RailVehInfo(i); |
143 const Engine* e = GetEngine(i); |
143 const Engine* e = GetEngine(i); |
144 |
144 |
145 if (!IsCompatibleRail(rvi->railtype, railtype) || |
145 if (!IsCompatibleRail(rvi->railtype, railtype) || |
146 rvi->flags & RVI_WAGON || |
146 rvi->railveh_type == RAILVEH_WAGON || |
147 (rvi->flags & RVI_MULTIHEAD && flag & 1) || |
147 (rvi->railveh_type == RAILVEH_MULTIHEAD && flag & 1) || |
148 !HASBIT(e->player_avail, _current_player) || |
148 !HASBIT(e->player_avail, _current_player) || |
149 e->reliability < 0x8A3D) { |
149 e->reliability < 0x8A3D) { |
150 continue; |
150 continue; |
151 } |
151 } |
152 |
152 |
2364 for (i = 0; i < NUM_TRAIN_ENGINES; i++) { |
2364 for (i = 0; i < NUM_TRAIN_ENGINES; i++) { |
2365 const RailVehicleInfo *rvi = RailVehInfo(i); |
2365 const RailVehicleInfo *rvi = RailVehInfo(i); |
2366 const Engine* e = GetEngine(i); |
2366 const Engine* e = GetEngine(i); |
2367 |
2367 |
2368 if (!IsCompatibleRail(rvi->railtype, railtype) || |
2368 if (!IsCompatibleRail(rvi->railtype, railtype) || |
2369 !(rvi->flags & RVI_WAGON) || |
2369 rvi->railveh_type != RAILVEH_WAGON || |
2370 !HASBIT(e->player_avail, _current_player)) { |
2370 !HASBIT(e->player_avail, _current_player)) { |
2371 continue; |
2371 continue; |
2372 } |
2372 } |
2373 |
2373 |
2374 if (rvi->cargo_type != cargo) continue; |
2374 if (rvi->cargo_type != cargo) continue; |