Mercurial > hg > openttd

changeset 4175:33d7e1689aef draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r5613) Rename VS_DISASTER to VS_SHADOW, because this is what this flag actually means
author tron <tron@openttd.org>
date Wed, 26 Jul 2006 08:32:20 +0000
parents 2a4dd8941412
children 2a3cca788409
files aircraft_cmd.c disaster_cmd.c vehicle.c vehicle.h
diffstat 4 files changed, 9 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/aircraft_cmd.c
+++ b/aircraft_cmd.c
@@ -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;
--- a/disaster_cmd.c
+++ b/disaster_cmd.c
@@ -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;
 	}
 }
 
--- a/vehicle.c
+++ b/vehicle.c
@@ -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);
--- a/vehicle.h
+++ b/vehicle.h
@@ -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,
 };