gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-12 10:30:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r22505) -Add: Separate EffectVehicleTypes for broken aircraft and smoke at copper ore mine, to make them distinguishable from each other and from smoke due to disasters. (only affects newly spawned effects)

Browse Source
This commit is contained in:
frosch 2011-05-28 09:45:12 +00:00
parent 7c21083227
commit 71822b6f1b
5 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/aircraft_cmd.cpp
View File

@ -1062,7 +1062,7 @@ static void HandleAircraftSmoke(Aircraft *v)
smoke_pos[v->direction].x, smoke_pos[v->direction].x,
smoke_pos[v->direction].y, smoke_pos[v->direction].y,
2, 2,
EV_SMOKE EV_BREAKDOWN_SMOKE_AIRCRAFT
); );
} }
} }

2
src/disaster_cmd.cpp
View File

@ -210,7 +210,7 @@ static bool DisasterTick_Zeppeliner(DisasterVehicle *v)
v->age = 0; 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) { } else if (v->current_order.GetDestination() == 0) {
if (IsValidTile(v->tile) && IsAirportTile(v->tile)) { if (IsValidTile(v->tile) && IsAirportTile(v->tile)) {

8
src/effectvehicle.cpp
View File

@ -537,12 +537,14 @@ static EffectInitProc * const _effect_init_procs[] = {
SteamSmokeInit, // EV_STEAM_SMOKE SteamSmokeInit, // EV_STEAM_SMOKE
DieselSmokeInit, // EV_DIESEL_SMOKE DieselSmokeInit, // EV_DIESEL_SMOKE
ElectricSparkInit, // EV_ELECTRIC_SPARK ElectricSparkInit, // EV_ELECTRIC_SPARK
SmokeInit, // EV_SMOKE SmokeInit, // EV_CRASH_SMOKE
ExplosionLargeInit, // EV_EXPLOSION_LARGE ExplosionLargeInit, // EV_EXPLOSION_LARGE
BreakdownSmokeInit, // EV_BREAKDOWN_SMOKE BreakdownSmokeInit, // EV_BREAKDOWN_SMOKE
ExplosionSmallInit, // EV_EXPLOSION_SMALL ExplosionSmallInit, // EV_EXPLOSION_SMALL
BulldozerInit, // EV_BULLDOZER BulldozerInit, // EV_BULLDOZER
BubbleInit, // EV_BUBBLE BubbleInit, // EV_BUBBLE
SmokeInit, // EV_BREAKDOWN_SMOKE_AIRCRAFT
SmokeInit, // EV_COPPER_MINE_SMOKE
}; };
assert_compile(lengthof(_effect_init_procs) == EV_END); assert_compile(lengthof(_effect_init_procs) == EV_END);
@ -552,12 +554,14 @@ static EffectTickProc * const _effect_tick_procs[] = {
SteamSmokeTick, // EV_STEAM_SMOKE SteamSmokeTick, // EV_STEAM_SMOKE
DieselSmokeTick, // EV_DIESEL_SMOKE DieselSmokeTick, // EV_DIESEL_SMOKE
ElectricSparkTick, // EV_ELECTRIC_SPARK ElectricSparkTick, // EV_ELECTRIC_SPARK
SmokeTick, // EV_SMOKE SmokeTick, // EV_CRASH_SMOKE
ExplosionLargeTick, // EV_EXPLOSION_LARGE ExplosionLargeTick, // EV_EXPLOSION_LARGE
BreakdownSmokeTick, // EV_BREAKDOWN_SMOKE BreakdownSmokeTick, // EV_BREAKDOWN_SMOKE
ExplosionSmallTick, // EV_EXPLOSION_SMALL ExplosionSmallTick, // EV_EXPLOSION_SMALL
BulldozerTick, // EV_BULLDOZER BulldozerTick, // EV_BULLDOZER
BubbleTick, // EV_BUBBLE BubbleTick, // EV_BUBBLE
SmokeTick, // EV_BREAKDOWN_SMOKE_AIRCRAFT
SmokeTick, // EV_COPPER_MINE_SMOKE
}; };
assert_compile(lengthof(_effect_tick_procs) == EV_END); assert_compile(lengthof(_effect_tick_procs) == EV_END);

4
src/effectvehicle_func.h
View File

@ -20,12 +20,14 @@ enum EffectVehicleType {
EV_STEAM_SMOKE = 1, ///< Smoke of steam engines. EV_STEAM_SMOKE = 1, ///< Smoke of steam engines.
EV_DIESEL_SMOKE = 2, ///< Smoke of diesel engines. EV_DIESEL_SMOKE = 2, ///< Smoke of diesel engines.
EV_ELECTRIC_SPARK = 3, ///< Sparcs of electric 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_EXPLOSION_LARGE = 5, ///< Various explosions.
EV_BREAKDOWN_SMOKE = 6, ///< Smoke of broken vehicles except aircraft. EV_BREAKDOWN_SMOKE = 6, ///< Smoke of broken vehicles except aircraft.
EV_EXPLOSION_SMALL = 7, ///< Various explosions. EV_EXPLOSION_SMALL = 7, ///< Various explosions.
EV_BULLDOZER = 8, ///< Bulldozer at roadworks. EV_BULLDOZER = 8, ///< Bulldozer at roadworks.
EV_BUBBLE = 9, ///< Bubble of bubble generator (industry). 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 EV_END
}; };

2
src/industry_cmd.cpp
View File

@ -862,7 +862,7 @@ static void TileLoop_Industry(TileIndex tile)
break; break;
case GFX_COPPER_MINE_CHIMNEY: 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; break;