diff options
| -rw-r--r-- | src/aircraft_cmd.cpp | 2 | ||||
| -rw-r--r-- | src/disaster_cmd.cpp | 2 | ||||
| -rw-r--r-- | src/effectvehicle.cpp | 8 | ||||
| -rw-r--r-- | src/effectvehicle_func.h | 4 | ||||
| -rw-r--r-- | src/industry_cmd.cpp | 2 |
5 files changed, 12 insertions, 6 deletions
diff --git a/src/aircraft_cmd.cpp b/src/aircraft_cmd.cpp index a330280be..ae80ae7f9 100644 --- a/src/aircraft_cmd.cpp +++ b/src/aircraft_cmd.cpp @@ -1062,7 +1062,7 @@ static void HandleAircraftSmoke(Aircraft *v) smoke_pos[v->direction].x, smoke_pos[v->direction].y, 2, - EV_SMOKE + EV_BREAKDOWN_SMOKE_AIRCRAFT ); } } diff --git a/src/disaster_cmd.cpp b/src/disaster_cmd.cpp index 9c4accc94..155b7c9c2 100644 --- a/src/disaster_cmd.cpp +++ b/src/disaster_cmd.cpp @@ -210,7 +210,7 @@ static bool DisasterTick_Zeppeliner(DisasterVehicle *v) v->age = 0; } - if (GB(v->tick_counter, 0, 3) == 0) CreateEffectVehicleRel(v, 0, -17, 2, EV_SMOKE); + if (GB(v->tick_counter, 0, 3) == 0) CreateEffectVehicleRel(v, 0, -17, 2, EV_CRASH_SMOKE); } else if (v->current_order.GetDestination() == 0) { if (IsValidTile(v->tile) && IsAirportTile(v->tile)) { diff --git a/src/effectvehicle.cpp b/src/effectvehicle.cpp index fbada6702..186a6d787 100644 --- a/src/effectvehicle.cpp +++ b/src/effectvehicle.cpp @@ -537,12 +537,14 @@ static EffectInitProc * const _effect_init_procs[] = { SteamSmokeInit, // EV_STEAM_SMOKE DieselSmokeInit, // EV_DIESEL_SMOKE ElectricSparkInit, // EV_ELECTRIC_SPARK - SmokeInit, // EV_SMOKE + SmokeInit, // EV_CRASH_SMOKE ExplosionLargeInit, // EV_EXPLOSION_LARGE BreakdownSmokeInit, // EV_BREAKDOWN_SMOKE ExplosionSmallInit, // EV_EXPLOSION_SMALL BulldozerInit, // EV_BULLDOZER BubbleInit, // EV_BUBBLE + SmokeInit, // EV_BREAKDOWN_SMOKE_AIRCRAFT + SmokeInit, // EV_COPPER_MINE_SMOKE }; assert_compile(lengthof(_effect_init_procs) == EV_END); @@ -552,12 +554,14 @@ static EffectTickProc * const _effect_tick_procs[] = { SteamSmokeTick, // EV_STEAM_SMOKE DieselSmokeTick, // EV_DIESEL_SMOKE ElectricSparkTick, // EV_ELECTRIC_SPARK - SmokeTick, // EV_SMOKE + SmokeTick, // EV_CRASH_SMOKE ExplosionLargeTick, // EV_EXPLOSION_LARGE BreakdownSmokeTick, // EV_BREAKDOWN_SMOKE ExplosionSmallTick, // EV_EXPLOSION_SMALL BulldozerTick, // EV_BULLDOZER BubbleTick, // EV_BUBBLE + SmokeTick, // EV_BREAKDOWN_SMOKE_AIRCRAFT + SmokeTick, // EV_COPPER_MINE_SMOKE }; assert_compile(lengthof(_effect_tick_procs) == EV_END); diff --git a/src/effectvehicle_func.h b/src/effectvehicle_func.h index 1a346775f..5c1d7b99f 100644 --- a/src/effectvehicle_func.h +++ b/src/effectvehicle_func.h @@ -20,12 +20,14 @@ enum EffectVehicleType { EV_STEAM_SMOKE = 1, ///< Smoke of steam engines. EV_DIESEL_SMOKE = 2, ///< Smoke of diesel engines. EV_ELECTRIC_SPARK = 3, ///< Sparcs of electric engines. - EV_SMOKE = 4, ///< Smoke of broken aircraft, copper mine and disasters. + EV_CRASH_SMOKE = 4, ///< Smoke of disasters. EV_EXPLOSION_LARGE = 5, ///< Various explosions. EV_BREAKDOWN_SMOKE = 6, ///< Smoke of broken vehicles except aircraft. EV_EXPLOSION_SMALL = 7, ///< Various explosions. EV_BULLDOZER = 8, ///< Bulldozer at roadworks. EV_BUBBLE = 9, ///< Bubble of bubble generator (industry). + EV_BREAKDOWN_SMOKE_AIRCRAFT = 10, ///< Smoke of broken aircraft. + EV_COPPER_MINE_SMOKE = 11, ///< Smoke at copper mine. EV_END }; diff --git a/src/industry_cmd.cpp b/src/industry_cmd.cpp index dde262085..d80652faa 100644 --- a/src/industry_cmd.cpp +++ b/src/industry_cmd.cpp @@ -862,7 +862,7 @@ static void TileLoop_Industry(TileIndex tile) break; case GFX_COPPER_MINE_CHIMNEY: - CreateEffectVehicleAbove(TileX(tile) * TILE_SIZE + 6, TileY(tile) * TILE_SIZE + 6, 43, EV_SMOKE); + CreateEffectVehicleAbove(TileX(tile) * TILE_SIZE + 6, TileY(tile) * TILE_SIZE + 6, 43, EV_COPPER_MINE_SMOKE); break; |