mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r5613) Rename VS_DISASTER to VS_SHADOW, because this is what this flag actually means

This commit is contained in:
tron 2006-07-26 08:32:20 +00:00
parent 3aa408ee02
commit 16bf3e35cd
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
aircraft_cmd.c
View File

@ -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;

12
disaster_cmd.c
View File

@ -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;
}
}

2
vehicle.c
View File

@ -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);

2
vehicle.h
View File

@ -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,
};