diff options
| author | rubidium <rubidium@openttd.org> | 2009-05-22 20:22:20 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-05-22 20:22:20 +0000 |
| commit | 7a37220881c995f317bf5bd0f3077fa6c9e9d098 (patch) | |
| tree | 347d24d175af30acacfedfb4ddf5c9e98d876036 /src/disaster_cmd.cpp | |
| parent | d37b840cf30ea987ab676f1a3631e112cac06244 (diff) | |
| download | openttd-7a37220881c995f317bf5bd0f3077fa6c9e9d098.tar.xz | |
(svn r16390) -Codechange: move u.road to RoadVehicle.
Diffstat (limited to 'src/disaster_cmd.cpp')
| -rw-r--r-- | src/disaster_cmd.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/disaster_cmd.cpp b/src/disaster_cmd.cpp index c9b05d18b..8a2ed7e61 100644 --- a/src/disaster_cmd.cpp +++ b/src/disaster_cmd.cpp @@ -314,11 +314,12 @@ static bool DisasterTick_Ufo(DisasterVehicle *v) return false; } else { /* Target a vehicle */ - Vehicle *u = Vehicle::Get(v->dest_tile); - if (u->type != VEH_ROAD || !IsRoadVehFront(u)) { + Vehicle *u_tmp = Vehicle::Get(v->dest_tile); + if (u_tmp->type != VEH_ROAD || !IsRoadVehFront(u_tmp)) { delete v; return false; } + RoadVehicle *u = (RoadVehicle *)u_tmp; uint dist = Delta(v->x_pos, u->x_pos) + Delta(v->y_pos, u->y_pos); @@ -336,8 +337,8 @@ static bool DisasterTick_Ufo(DisasterVehicle *v) if (z <= u->z_pos && (u->vehstatus & VS_HIDDEN) == 0) { v->age++; - if (u->u.road.crashed_ctr == 0) { - u->u.road.crashed_ctr++; + if (u->crashed_ctr == 0) { + u->crashed_ctr++; AddNewsItem(STR_NEWS_DISASTER_SMALL_UFO, NS_ACCIDENT_VEHICLE, |