# HG changeset patch # User tron # Date 1153902740 0 # Node ID c0bcc65f36d4d3102c7a5030f1c5ab9069185b17 # Parent 9ba4e15dac0fe989218a01c8c0d5c01baff0bd5c (svn r5613) Rename VS_DISASTER to VS_SHADOW, because this is what this flag actually means diff -r 9ba4e15dac0f -r c0bcc65f36d4 aircraft_cmd.c --- a/aircraft_cmd.c Wed Jul 26 08:27:05 2006 +0000 +++ b/aircraft_cmd.c Wed Jul 26 08:32:20 2006 +0000 @@ -264,7 +264,7 @@ u->z_height = 1; v->vehstatus = VS_HIDDEN | VS_STOPPED | VS_DEFPAL; - u->vehstatus = VS_HIDDEN | VS_UNCLICKABLE | VS_DISASTER; + u->vehstatus = VS_HIDDEN | VS_UNCLICKABLE | VS_SHADOW; v->spritenum = avi->image_index; // v->cargo_count = u->number_of_pieces = 0; diff -r 9ba4e15dac0f -r c0bcc65f36d4 disaster_cmd.c --- a/disaster_cmd.c Wed Jul 26 08:27:05 2006 +0000 +++ b/disaster_cmd.c Wed Jul 26 08:32:20 2006 +0000 @@ -570,7 +570,7 @@ u->next = w; InitializeDisasterVehicle(w, -6 * TILE_SIZE, v->y_pos, 0, DIR_SW, 12); - w->vehstatus |= VS_DISASTER; + w->vehstatus |= VS_SHADOW; } else if (v->current_order.station < 1) { int x = TileX(v->dest_tile) * TILE_SIZE; @@ -736,7 +736,7 @@ if (u != NULL) { v->next = u; InitializeDisasterVehicle(u, x, 0, 0, DIR_SE, 1); - u->vehstatus |= VS_DISASTER; + u->vehstatus |= VS_SHADOW; } } @@ -758,7 +758,7 @@ if (u != NULL) { v->next = u; InitializeDisasterVehicle(u, x, 0, 0, DIR_SE, 3); - u->vehstatus |= VS_DISASTER; + u->vehstatus |= VS_SHADOW; } } @@ -792,7 +792,7 @@ if (u != NULL) { v->next = u; InitializeDisasterVehicle(u, x, y, 0, DIR_SE, 5); - u->vehstatus |= VS_DISASTER; + u->vehstatus |= VS_SHADOW; } } @@ -826,7 +826,7 @@ if (u != NULL) { v->next = u; InitializeDisasterVehicle(u, x, y, 0, DIR_SW, 7); - u->vehstatus |= VS_DISASTER; + u->vehstatus |= VS_SHADOW; w = ForceAllocateSpecialVehicle(); if (w != NULL) { @@ -855,7 +855,7 @@ if (u != NULL) { v->next = u; InitializeDisasterVehicle(u, x, y, 0, DIR_NW, 10); - u->vehstatus |= VS_DISASTER; + u->vehstatus |= VS_SHADOW; } } diff -r 9ba4e15dac0f -r c0bcc65f36d4 vehicle.c --- a/vehicle.c Wed Jul 26 08:27:05 2006 +0000 +++ b/vehicle.c Wed Jul 26 08:32:20 2006 +0000 @@ -723,7 +723,7 @@ { uint32 image = v->cur_image; - if (v->vehstatus & VS_DISASTER) { + if (v->vehstatus & VS_SHADOW) { MAKE_TRANSPARENT(image); } else if (v->vehstatus & VS_DEFPAL) { image |= (v->vehstatus & VS_CRASHED) ? PALETTE_CRASH : GetVehiclePalette(v); diff -r 9ba4e15dac0f -r c0bcc65f36d4 vehicle.h --- a/vehicle.h Wed Jul 26 08:27:05 2006 +0000 +++ b/vehicle.h Wed Jul 26 08:32:20 2006 +0000 @@ -23,7 +23,7 @@ VS_UNCLICKABLE = 4, VS_DEFPAL = 0x8, VS_TRAIN_SLOWING = 0x10, - VS_DISASTER = 0x20, + VS_SHADOW = 0x20, VS_AIRCRAFT_BROKEN = 0x40, VS_CRASHED = 0x80, };