From f499de66731ea3e2a9014f9af376c10501fcb7f1 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Tue, 24 Jan 2017 19:45:32 +0000 Subject: [PATCH 1/2] TBTR: Fix incorrect cost estimates in GUI for templates. --- src/tbtr_template_vehicle_func.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tbtr_template_vehicle_func.cpp b/src/tbtr_template_vehicle_func.cpp index 3c5ead2592..3f149e0f96 100644 --- a/src/tbtr_template_vehicle_func.cpp +++ b/src/tbtr_template_vehicle_func.cpp @@ -109,7 +109,7 @@ Money CalculateOverallTemplateCost(const TemplateVehicle *tv) { Money val = 0; - for (; tv; tv = tv->Next()) { + for (; tv; tv = tv->GetNextUnit()) { val += (Engine::Get(tv->engine_type))->GetCost(); } return val; From 11e4bcee405e4b91d0472104e02367c9303a9402 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Tue, 24 Jan 2017 19:44:51 +0000 Subject: [PATCH 2/2] Slightly decrease proximity required for trains to crash. This is to fix trains of different companies being able to crash when two stations or line-ends are directly against each other. --- src/train_cmd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp index f8e560cab8..516fd29d31 100644 --- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -3034,7 +3034,7 @@ static Vehicle *FindTrainCollideEnum(Vehicle *v, void *data) /* Slower check using multiplication */ int min_diff = (Train::From(v)->gcache.cached_veh_length + 1) / 2 + (tcc->v->gcache.cached_veh_length + 1) / 2 - 1; - if (x_diff * x_diff + y_diff * y_diff > min_diff * min_diff) return NULL; + if (x_diff * x_diff + y_diff * y_diff >= min_diff * min_diff) return NULL; /* Happens when there is a train under bridge next to bridge head */ if (abs(v->z_pos - tcc->v->z_pos) > 5) return NULL;