diff options
| author | peter1138 <peter1138@openttd.org> | 2005-11-07 13:02:33 +0000 |
|---|---|---|
| committer | peter1138 <peter1138@openttd.org> | 2005-11-07 13:02:33 +0000 |
| commit | 8bcfa23d29b55b7a1b5e856b1e72c74e5cd526e9 (patch) | |
| tree | 34e89928d1da44fbb1ea644a37802d8a8561b690 | |
| parent | bc25cd89bffd79785957b3f91f78c6646e9a51a6 (diff) | |
| download | openttd-8bcfa23d29b55b7a1b5e856b1e72c74e5cd526e9.tar.xz | |
(svn r3150) Unify some code duplication in HandleLocomotiveSmokeCloud()
| -rw-r--r-- | train_cmd.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/train_cmd.c b/train_cmd.c index 58100e871..0e79e76a0 100644 --- a/train_cmd.c +++ b/train_cmd.c @@ -1876,6 +1876,10 @@ static void HandleLocomotiveSmokeCloud(Vehicle *v) (v->vehstatus & VS_HIDDEN) || (v->u.rail.track & 0xC0)) continue; + // No smoke in depots or tunnels + if (IsTileDepotType(v->tile, TRANSPORT_RAIL) || IsTunnelTile(v->tile)) + continue; + if (effect_type == 0) { // Use default effect type for engine class. effect_type = RailVehInfo(engtype)->engclass; @@ -1889,21 +1893,21 @@ static void HandleLocomotiveSmokeCloud(Vehicle *v) switch (effect_type) { case 0: // steam smoke. - if ( (v->tick_counter&0xF) == 0 && !IsTileDepotType(v->tile, TRANSPORT_RAIL) && !IsTunnelTile(v->tile)) { + if (GB(v->tick_counter, 0, 4) == 0) { CreateEffectVehicleRel(v, x, y, 10, EV_STEAM_SMOKE); } break; case 1: // diesel smoke - if (u->cur_speed <= 40 && !IsTileDepotType(v->tile, TRANSPORT_RAIL) && !IsTunnelTile(v->tile) && GB(Random(), 0, 16) <= 0x1E00) { + if (u->cur_speed <= 40 && GB(Random(), 0, 16) <= 0x1E00) { CreateEffectVehicleRel(v, 0, 0, 10, EV_DIESEL_SMOKE); } break; case 2: // blue spark - if (GB(v->tick_counter, 0, 2) == 0 && !IsTileDepotType(v->tile, TRANSPORT_RAIL) && !IsTunnelTile(v->tile) && GB(Random(), 0, 16) <= 0x5B0) { + if (GB(v->tick_counter, 0, 2) == 0 && GB(Random(), 0, 16) <= 0x5B0) { CreateEffectVehicleRel(v, 0, 0, 10, EV_ELECTRIC_SPARK); } break; |