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

Merge branch 'improved_breakdowns' into jgrpp

Browse Source 
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
#	src/train_cmd.cpp
This commit is contained in:
Jonathan G Rennison
2017-06-06 21:08:37 +01:00
parent 21696cc126 350c2bb24f
commit bbd2e6f2f5
7 changed files with 48 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/roadveh_cmd.cpp
View File

@@ -517,20 +517,35 @@ static bool RoadVehIsCrashed(RoadVehicle *v)
return true;
}
struct CheckRoadVehCrashTrainInfo {
const Vehicle *u;
bool found = false;
CheckRoadVehCrashTrainInfo(const Vehicle *u_)
: u(u_) { }
};
/**
* Check routine whether a road and a train vehicle have collided.
* @param v %Train vehicle to test.
* @param data Road vehicle to test.
* @param data Info including road vehicle to test.
* @return %Train vehicle if the vehicles collided, else \c NULL.
*/
static Vehicle *EnumCheckRoadVehCrashTrain(Vehicle *v, void *data)
{
const Vehicle *u = (Vehicle*)data;
CheckRoadVehCrashTrainInfo *info = (CheckRoadVehCrashTrainInfo*) data;
return (v->type == VEH_TRAIN &&
abs(v->z_pos - u->z_pos) <= 6 &&
abs(v->x_pos - u->x_pos) <= 4 &&
abs(v->y_pos - u->y_pos) <= 4) ? v : NULL;
if (v->type == VEH_TRAIN &&
abs(v->z_pos - info->u->z_pos) <= 6 &&
abs(v->x_pos - info->u->x_pos) <= 4 &&
abs(v->y_pos - info->u->y_pos) <= 4) {
info->found = true;
extern void TrainRoadVehicleCrashBreakdown(Vehicle *v);
TrainRoadVehicleCrashBreakdown(v);
return v;
} else {
return NULL;
}
}
uint RoadVehicle::Crash(bool flooded)
@@ -576,7 +591,9 @@ static bool RoadVehCheckTrainCrash(RoadVehicle *v)
if (!IsLevelCrossingTile(tile)) continue;
if (HasVehicleOnPosXY(v->x_pos, v->y_pos, u, EnumCheckRoadVehCrashTrain)) {
CheckRoadVehCrashTrainInfo info(u);
FindVehicleOnPosXY(v->x_pos, v->y_pos, &info, EnumCheckRoadVehCrashTrain);
if (info.found) {
RoadVehCrash(v);
return true;
}