summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortron <tron@openttd.org>2006-07-26 08:32:20 +0000
committertron <tron@openttd.org>2006-07-26 08:32:20 +0000
commit677ecc624c7f68c0b0025ca42468d15621ce4a7f (patch)
tree79aea47c4debb842ca36742c98a698c4a930d935
parent9b0875a9e52f7e1224b7824a7ec4e4883b628df2 (diff)
downloadopenttd-677ecc624c7f68c0b0025ca42468d15621ce4a7f.tar.xz
(svn r5613) Rename VS_DISASTER to VS_SHADOW, because this is what this flag actually means
-rw-r--r--aircraft_cmd.c2
-rw-r--r--disaster_cmd.c12
-rw-r--r--vehicle.c2
-rw-r--r--vehicle.h2
4 files changed, 9 insertions, 9 deletions
diff --git a/aircraft_cmd.c b/aircraft_cmd.c
index 13909587c..913fda5bd 100644
--- a/aircraft_cmd.c
+++ b/aircraft_cmd.c
@@ -264,7 +264,7 @@ int32 CmdBuildAircraft(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
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 --git a/disaster_cmd.c b/disaster_cmd.c
index 2b1488bb9..27ca9e29d 100644
--- a/disaster_cmd.c
+++ b/disaster_cmd.c
@@ -570,7 +570,7 @@ static void DisasterTick_4(Vehicle *v)
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 @@ static void Disaster0_Init(void)
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 @@ static void Disaster1_Init(void)
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 @@ static void Disaster2_Init(void)
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 @@ static void Disaster3_Init(void)
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 @@ static void Disaster4_Init(void)
if (u != NULL) {
v->next = u;
InitializeDisasterVehicle(u, x, y, 0, DIR_NW, 10);
- u->vehstatus |= VS_DISASTER;
+ u->vehstatus |= VS_SHADOW;
}
}
diff --git a/vehicle.c b/vehicle.c
index 69fbb0e82..4fa55907c 100644
--- a/vehicle.c
+++ b/vehicle.c
@@ -723,7 +723,7 @@ static void DoDrawVehicle(const Vehicle *v)
{
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 --git a/vehicle.h b/vehicle.h
index c4e83841e..40659bfd3 100644
--- a/vehicle.h
+++ b/vehicle.h
@@ -23,7 +23,7 @@ enum VehStatus {
VS_UNCLICKABLE = 4,
VS_DEFPAL = 0x8,
VS_TRAIN_SLOWING = 0x10,
- VS_DISASTER = 0x20,
+ VS_SHADOW = 0x20,
VS_AIRCRAFT_BROKEN = 0x40,
VS_CRASHED = 0x80,
};