summaryrefslogtreecommitdiff
path: root/src/disaster_cmd.cpp
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2007-03-08 16:27:54 +0000
committerrubidium <rubidium@openttd.org>2007-03-08 16:27:54 +0000
commitce919e8c719f0f698ac86dcaa528368316f2e52d (patch)
treee32a4dc6207efbaacc5af4e5c41a353b98b9a897 /src/disaster_cmd.cpp
parentaca3fb2b6ef69ae571b167d3071edd46d0ed383c (diff)
downloadopenttd-ce919e8c719f0f698ac86dcaa528368316f2e52d.tar.xz
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
Diffstat (limited to 'src/disaster_cmd.cpp')
-rw-r--r--src/disaster_cmd.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/disaster_cmd.cpp b/src/disaster_cmd.cpp
index 15d80abaa..7a302ee61 100644
--- a/src/disaster_cmd.cpp
+++ b/src/disaster_cmd.cpp
@@ -116,11 +116,11 @@ static void DisasterVehicleUpdateImage(Vehicle *v)
}
-/** Initialize a disaster vehicle. These vehicles are of type VEH_Disaster, are unclickable
+/** Initialize a disaster vehicle. These vehicles are of type VEH_DISASTER, are unclickable
* and owned by nobody */
static void InitializeDisasterVehicle(Vehicle *v, int x, int y, byte z, Direction direction, byte subtype)
{
- v->type = VEH_Disaster;
+ v->type = VEH_DISASTER;
v->x_pos = x;
v->y_pos = y;
v->z_pos = z;
@@ -330,7 +330,7 @@ static void DisasterTick_Ufo(Vehicle *v)
v->current_order.dest = 1;
FOR_ALL_VEHICLES(u) {
- if (u->type == VEH_Road && IsHumanPlayer(u->owner)) {
+ if (u->type == VEH_ROAD && IsHumanPlayer(u->owner)) {
v->dest_tile = u->index;
v->age = 0;
return;
@@ -341,7 +341,7 @@ static void DisasterTick_Ufo(Vehicle *v)
} else {
/* Target a vehicle */
u = GetVehicle(v->dest_tile);
- if (u->type != VEH_Road) {
+ if (u->type != VEH_ROAD) {
DeleteDisasterVeh(v);
return;
}
@@ -590,7 +590,7 @@ static void DisasterTick_Big_Ufo(Vehicle *v)
v->current_order.dest = 2;
FOR_ALL_VEHICLES(u) {
- if (u->type == VEH_Train || u->type == VEH_Road) {
+ if (u->type == VEH_TRAIN || u->type == VEH_ROAD) {
if (delta(u->x_pos, v->x_pos) + delta(u->y_pos, v->y_pos) <= 12 * TILE_SIZE) {
u->breakdown_ctr = 5;
u->breakdown_delay = 0xF0;