diff --git a/src/tbtr_template_vehicle_func.cpp b/src/tbtr_template_vehicle_func.cpp index 7be8d42540..50864f805d 100644 --- a/src/tbtr_template_vehicle_func.cpp +++ b/src/tbtr_template_vehicle_func.cpp @@ -141,7 +141,7 @@ void DrawTemplate(const TemplateVehicle *tv, int left, int right, int y) } // copy important stuff from the virtual vehicle to the template -inline void SetupTemplateVehicleFromVirtual(TemplateVehicle *tmp, TemplateVehicle *prev, Train *virt) +void SetupTemplateVehicleFromVirtual(TemplateVehicle *tmp, TemplateVehicle *prev, Train *virt) { if (prev) { prev->SetNext(tmp); diff --git a/src/tbtr_template_vehicle_func.h b/src/tbtr_template_vehicle_func.h index 5882ad1252..a927948a0a 100644 --- a/src/tbtr_template_vehicle_func.h +++ b/src/tbtr_template_vehicle_func.h @@ -26,8 +26,8 @@ Money CalculateOverallTemplateCost(const TemplateVehicle*); void DrawTemplate(const TemplateVehicle*, int, int, int); TemplateVehicle* TemplateVehicleFromVirtualTrain(Train *virt); - Train* DeleteVirtualTrain(Train*, Train *); +void SetupTemplateVehicleFromVirtual(TemplateVehicle *tmp, TemplateVehicle *prev, Train *virt); CommandCost CmdTemplateReplaceVehicle(Train*, bool, DoCommandFlag); diff --git a/src/vehicle_cmd.cpp b/src/vehicle_cmd.cpp index 4a8419b2cf..dd706b7a5a 100644 --- a/src/vehicle_cmd.cpp +++ b/src/vehicle_cmd.cpp @@ -784,34 +784,6 @@ static void CloneVehicleName(const Vehicle *src, Vehicle *dst) /* All done. If we didn't find a name, it'll just use its default. */ } -inline void SetupTemplateVehicleFromVirtual(TemplateVehicle *tmp, TemplateVehicle *prev, Train *virt) -{ - if (prev) { - prev->SetNext(tmp); - tmp->SetPrev(prev); - tmp->SetFirst(prev->First()); - } - tmp->railtype = virt->railtype; - tmp->owner = virt->owner; - tmp->value = virt->value; - - // set the subtype but also clear the virtual flag while doing it - tmp->subtype = virt->subtype & ~(1 << GVSF_VIRTUAL); - // set the cargo type and capacity - tmp->cargo_type = virt->cargo_type; - tmp->cargo_subtype = virt->cargo_subtype; - tmp->cargo_cap = virt->cargo_cap; - - const GroundVehicleCache *gcache = virt->GetGroundVehicleCache(); - tmp->max_speed = virt->GetDisplayMaxSpeed(); - tmp->power = gcache->cached_power; - tmp->weight = gcache->cached_weight; - tmp->max_te = gcache->cached_max_te / 1000; - - virt->GetImage(DIR_W, EIT_IN_DEPOT, &tmp->sprite_seq); - tmp->image_dimensions.SetFromTrain(virt); -} - /** * Toggles 'reuse depot vehicles' on a template vehicle. * @param tile unused