From 6a292f9f58d2164bdaf2a104f9b86d1b41be3c86 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Sat, 31 Aug 2024 11:31:19 +0100 Subject: [PATCH] TBTR: Fix various formatting and const issues --- src/tbtr_template_vehicle_func.cpp | 20 ++++++-------------- src/tbtr_template_vehicle_func.h | 22 +++++++++++----------- src/vehicle_cmd.cpp | 4 ++-- 3 files changed, 19 insertions(+), 27 deletions(-) diff --git a/src/tbtr_template_vehicle_func.cpp b/src/tbtr_template_vehicle_func.cpp index 48aea7835e..4bd317d990 100644 --- a/src/tbtr_template_vehicle_func.cpp +++ b/src/tbtr_template_vehicle_func.cpp @@ -303,9 +303,8 @@ TBTRDiffFlags TrainTemplateDifference(const Train *t, const TemplateVehicle *tv) void BreakUpRemainders(Train *t) { while (t != nullptr) { - Train *move; if (HasBit(t->subtype, GVSF_ENGINE)) { - move = t; + Train *move = t; t = t->Next(); DoCommand(move->tile, move->index | (1 << 22), INVALID_VEHICLE, DC_EXEC, CMD_MOVE_RAIL_VEHICLE); NeutralizeStatus(move); @@ -315,19 +314,12 @@ void BreakUpRemainders(Train *t) } } -/* Make sure the real train wagon has the right cargo */ -void CopyWagonStatus(TemplateVehicle *from, Train *to) -{ - to->cargo_type = from->cargo_type; - to->cargo_subtype = from->cargo_subtype; -} - uint CountTrainsNeedingTemplateReplacement(GroupID g_id, const TemplateVehicle *tv) { uint count = 0; if (tv == nullptr) return count; - for (Train *t : Train::IterateFrontOnly()) { + for (const Train *t : Train::IterateFrontOnly()) { if (t->IsPrimaryVehicle() && t->group_id == g_id && TrainTemplateDifference(t, tv) != TBTRDF_NONE) { count++; } @@ -336,7 +328,7 @@ uint CountTrainsNeedingTemplateReplacement(GroupID g_id, const TemplateVehicle * } /* Refit each vehicle in t as is in tv, assume t and tv contain the same types of vehicles */ -CommandCost CmdRefitTrainFromTemplate(Train *t, TemplateVehicle *tv, DoCommandFlag flags) +CommandCost CmdRefitTrainFromTemplate(Train *t, const TemplateVehicle *tv, DoCommandFlag flags) { CommandCost cost(t->GetExpenseType(false)); @@ -353,7 +345,7 @@ CommandCost CmdRefitTrainFromTemplate(Train *t, TemplateVehicle *tv, DoCommandFl } /* Set unit direction of each vehicle in t as is in tv, assume t and tv contain the same types of vehicles */ -CommandCost CmdSetTrainUnitDirectionFromTemplate(Train *t, TemplateVehicle *tv, DoCommandFlag flags) +CommandCost CmdSetTrainUnitDirectionFromTemplate(Train *t, const TemplateVehicle *tv, DoCommandFlag flags) { CommandCost cost(t->GetExpenseType(false)); @@ -373,7 +365,7 @@ CommandCost CmdSetTrainUnitDirectionFromTemplate(Train *t, TemplateVehicle *tv, * actually moving vehicles around to work properly. * We do this worst-cast test instead. */ -CommandCost TestBuyAllTemplateVehiclesInChain(TemplateVehicle *tv, TileIndex tile) +CommandCost TestBuyAllTemplateVehiclesInChain(const TemplateVehicle *tv, TileIndex tile) { CommandCost cost(EXPENSES_NEW_VEHICLES); @@ -428,7 +420,7 @@ void UpdateAllTemplateVehicleImages() if (tv->Prev() == nullptr) { Backup cur_company(_current_company, tv->owner, FILE_LINE); StringID err; - Train* t = VirtualTrainFromTemplateVehicle(tv, err, 0); + Train *t = VirtualTrainFromTemplateVehicle(tv, err, 0); if (t != nullptr) { int tv_len = 0; for (TemplateVehicle *u = tv; u != nullptr; u = u->Next()) { diff --git a/src/tbtr_template_vehicle_func.h b/src/tbtr_template_vehicle_func.h index 6196b45e6d..9d42677abb 100644 --- a/src/tbtr_template_vehicle_func.h +++ b/src/tbtr_template_vehicle_func.h @@ -15,20 +15,20 @@ #include "tbtr_template_vehicle.h" #include "3rdparty/cpp-btree/btree_set.h" -Train* VirtualTrainFromTemplateVehicle(const TemplateVehicle* tv, StringID &err, uint32_t user); +Train *VirtualTrainFromTemplateVehicle(const TemplateVehicle *tv, StringID &err, uint32_t user); -void BuildTemplateGuiList(GUITemplateList*, Scrollbar*, Owner, RailType); +void BuildTemplateGuiList(GUITemplateList *, Scrollbar *, Owner, RailType); -Money CalculateOverallTemplateCost(const TemplateVehicle*); -Money CalculateOverallTemplateDisplayRunningCost(const TemplateVehicle*); +Money CalculateOverallTemplateCost(const TemplateVehicle *); +Money CalculateOverallTemplateDisplayRunningCost(const TemplateVehicle *); -void DrawTemplate(const TemplateVehicle*, int, int, int, int); +void DrawTemplate(const TemplateVehicle *, int, int, int, int); -TemplateVehicle* TemplateVehicleFromVirtualTrain(Train *virt); -Train* DeleteVirtualTrain(Train*, Train *); +TemplateVehicle *TemplateVehicleFromVirtualTrain(Train *virt); +Train* DeleteVirtualTrain(Train *, Train *); void SetupTemplateVehicleFromVirtual(TemplateVehicle *tmp, TemplateVehicle *prev, Train *virt); -CommandCost CmdTemplateReplaceVehicle(Train*, bool, DoCommandFlag); +CommandCost CmdTemplateReplaceVehicle(Train *, bool, DoCommandFlag); TemplateVehicle *GetTemplateVehicleByGroupID(GroupID gid); TemplateVehicle *GetTemplateVehicleByGroupIDRecursive(GroupID gid); @@ -44,10 +44,10 @@ struct TemplateDepotVehicles { uint CountTrainsNeedingTemplateReplacement(GroupID g_id, const TemplateVehicle *tv); -CommandCost TestBuyAllTemplateVehiclesInChain(TemplateVehicle *tv, TileIndex tile); +CommandCost TestBuyAllTemplateVehiclesInChain(const TemplateVehicle *tv, TileIndex tile); -CommandCost CmdRefitTrainFromTemplate(Train *t, TemplateVehicle *tv, DoCommandFlag flags); -CommandCost CmdSetTrainUnitDirectionFromTemplate(Train *t, TemplateVehicle *tv, DoCommandFlag flags); +CommandCost CmdRefitTrainFromTemplate(Train *t, const TemplateVehicle *tv, DoCommandFlag flags); +CommandCost CmdSetTrainUnitDirectionFromTemplate(Train *t, const TemplateVehicle *tv, DoCommandFlag flags); void BreakUpRemainders(Train *t); bool TemplateVehicleContainsEngineOfRailtype(const TemplateVehicle *tv, RailType type); diff --git a/src/vehicle_cmd.cpp b/src/vehicle_cmd.cpp index 2666f09afd..7b1c46d829 100644 --- a/src/vehicle_cmd.cpp +++ b/src/vehicle_cmd.cpp @@ -1279,7 +1279,7 @@ CommandCost CmdReplaceTemplateVehicle(TileIndex tile, DoCommandFlag flags, uint3 vehicle = vehicle->First(); - Train* train = Train::From(vehicle); + Train *train = Train::From(vehicle); if (!train->IsVirtual()) { return CMD_ERROR; } @@ -1321,7 +1321,7 @@ CommandCost CmdReplaceTemplateVehicle(TileIndex tile, DoCommandFlag flags, uint3 template_vehicle->name = std::move(name); } - // Make sure our replacements still point to the correct thing. + /* Make sure our replacements still point to the correct thing. */ if (old_ID != INVALID_VEHICLE && old_ID != template_vehicle->index) { bool reindex = false; for (TemplateReplacement *tr : TemplateReplacement::Iterate()) {