diff options
| author | tron <tron@openttd.org> | 2005-10-19 06:46:41 +0000 |
|---|---|---|
| committer | tron <tron@openttd.org> | 2005-10-19 06:46:41 +0000 |
| commit | 758ae7e8f63edbcc193443963e7a8cbe7dcac675 (patch) | |
| tree | b1be08aaabd03b45d086543edd2c1e7ae8031d8e /disaster_cmd.c | |
| parent | cb67ee9bf50e46d194b62920775e2a5998a1318b (diff) | |
| download | openttd-758ae7e8f63edbcc193443963e7a8cbe7dcac675.tar.xz | |
(svn r3064) Replace some numbers by sprite names
Diffstat (limited to 'disaster_cmd.c')
| -rw-r--r-- | disaster_cmd.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/disaster_cmd.c b/disaster_cmd.c index 842f35df8..c9cc78db2 100644 --- a/disaster_cmd.c +++ b/disaster_cmd.c @@ -17,6 +17,7 @@ #include "airport_movement.h" #include "sound.h" #include "variables.h" +#include "table/sprites.h" static void DisasterClearSquare(TileIndex tile) { @@ -223,9 +224,9 @@ static void DisasterTick_Zeppeliner(Vehicle *v) if (++v->age == 1) { CreateEffectVehicleRel(v, 0, 7, 8, EV_EXPLOSION_LARGE); SndPlayVehicleFx(SND_12_EXPLOSION, v); - v->u.disaster.image_override = 0xF42; + v->u.disaster.image_override = SPR_BLIMP_CRASHING; } else if (v->age == 70) { - v->u.disaster.image_override = 0xF43; + v->u.disaster.image_override = SPR_BLIMP_CRASHED; } else if (v->age <= 300) { if (!(v->tick_counter&7)) { uint32 r = Random(); @@ -261,7 +262,7 @@ static void DisasterTick_UFO(Vehicle *v) uint dist; byte z; - v->u.disaster.image_override = (++v->tick_counter & 8) ? 0xF45 : 0xF44; + v->u.disaster.image_override = (++v->tick_counter & 8) ? SPR_UFO_SMALL_SCOUT_DARKER : SPR_UFO_SMALL_SCOUT; if (v->current_order.station == 0) { // fly around randomly @@ -351,7 +352,7 @@ static void DisasterTick_2(Vehicle *v) v->tick_counter++; v->u.disaster.image_override = - (v->current_order.station == 1 && v->tick_counter&4) ? 0xF4F : 0; + (v->current_order.station == 1 && v->tick_counter&4) ? SPR_F_15_FIRING : 0; GetNewVehiclePos(v, &gp); SetDisasterVehiclePos(v, gp.x, gp.y, v->z_pos); @@ -422,7 +423,7 @@ static void DisasterTick_3(Vehicle *v) v->tick_counter++; v->u.disaster.image_override = - (v->current_order.station == 1 && v->tick_counter&4) ? 0xF53 : 0; + (v->current_order.station == 1 && v->tick_counter&4) ? SPR_AH_64A_FIRING : 0; GetNewVehiclePos(v, &gp); SetDisasterVehiclePos(v, gp.x, gp.y, v->z_pos); @@ -492,8 +493,7 @@ static void DisasterTick_3b(Vehicle *v) if (++v->tick_counter & 1) return; - if (++v->cur_image == 0xF40 + 1) - v->cur_image = 0xF3E; + if (++v->cur_image > SPR_ROTOR_MOVING_3) v->cur_image = SPR_ROTOR_MOVING_1; VehiclePositionChanged(v); BeginVehicleMove(v); |