dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r16390) -Codechange: move u.road to RoadVehicle.

Browse Source
This commit is contained in:
rubidium
2009-05-22 20:22:20 +00:00
parent d37b840cf3
commit 7a37220881
22 changed files with 308 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/disaster_cmd.cpp
View File

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