TBTR: Remove lots of unused/dead code.

src/tbtr_template_vehicle.cpp

@@ -103,27 +103,6 @@ TemplateVehicle* TemplateVehicle::GetPrevUnit()
 	return tv;
 }
 
-/** setting */
-void appendTemplateVehicle(TemplateVehicle *orig, TemplateVehicle *newv)
-{
-	if (!orig) return;
-	while (orig->Next()) orig = orig->Next();
-	orig->SetNext(newv);
-	newv->SetPrev(orig);
-	newv->SetFirst(orig->First());
-}
-
-void insertTemplateVehicle(TemplateVehicle *orig, TemplateVehicle *newv, TemplateVehicle *insert_after)
-{
-	if (!orig || !insert_after) return;
-	TemplateVehicle *insert_before = insert_after->Next();
-	insert_after->SetNext(newv);
-	insert_before->SetPrev(newv);
-	newv->SetPrev(insert_after);
-	newv->SetNext(insert_before);
-	newv->SetFirst(insert_after);
-}
-
 /** Length()
  * @return: length of vehicle, including current part
  */
@@ -177,18 +156,6 @@ short TemplateVehicle::NumGroupsUsingTemplate() const
 	return amount;
 }
 
-short TemplateVehicle::CountEnginesInChain()
-{
-	TemplateVehicle *tv = this->first;
-	short count = 0;
-	for (; tv != NULL; tv = tv->GetNextUnit()) {
-		if (HasBit(tv->subtype, GVSF_ENGINE)) {
-			count++;
-		}
-	}
-	return count;
-}
-
 short DeleteTemplateReplacementsByGroupID(GroupID g_id)
 {
 	short del_amount = 0;

src/tbtr_template_vehicle.h

@@ -156,16 +156,8 @@ public:
 
 	short NumGroupsUsingTemplate() const;
 
-	short CountEnginesInChain();
-
 };
 
-void appendTemplateVehicle(TemplateVehicle*, TemplateVehicle*);
-void insertTemplateVehicle(TemplateVehicle*, TemplateVehicle*, TemplateVehicle*);
-
-void NeutralizeVehicleStatus(Train*);
-void SplitVehicleRemainders(Train*);
-
 // TemplateReplacement stuff
 
 typedef Pool<TemplateReplacement, uint16, 16, 1024> TemplateReplacementPool;

src/tbtr_template_vehicle_func.cpp

@@ -196,34 +196,6 @@ TemplateVehicle* TemplateVehicleFromVirtualTrain(Train *virt)
 	return tmp->First();
 }
 
-// return last in a chain (really last, so even a singular articulated part of a vehicle if the last one is artic)
-inline TemplateVehicle* Last(TemplateVehicle *chain)
-{
-	if (!chain) return NULL;
-	while (chain->Next()) {
-		chain = chain->Next();
-	}
-	return chain;
-}
-
-inline Train* Last(Train *chain)
-{
-	if (!chain) return NULL;
-	while (chain->GetNextUnit()) {
-		chain = chain->GetNextUnit();
-	}
-	return chain;
-}
-
-// return: pointer to former vehicle
-TemplateVehicle *DeleteTemplateVehicle(TemplateVehicle *todel)
-{
-	if (!todel) return NULL;
-	TemplateVehicle *cur = todel;
-	delete todel;
-	return cur;
-}
-
 // forward declaration, defined in train_cmd.cpp
 CommandCost CmdSellRailWagon(DoCommandFlag, Vehicle*, uint16, uint32);
 
@@ -323,18 +295,6 @@ Train* DepotContainsEngine(TileIndex tile, EngineID eid, Train *not_in = NULL)
 	return NULL;
 }
 
-void CopyStatus(Train *from, Train *to)
-{
-	DoCommand(to->tile, from->group_id, to->index, DC_EXEC, CMD_ADD_VEHICLE_GROUP);
-	to->cargo_type = from->cargo_type;
-	to->cargo_subtype = from->cargo_subtype;
-
-	// swap names
-	char *tmp = to->name;
-	to->name = from->name;
-	from->name = tmp;
-}
-
 void NeutralizeStatus(Train *t)
 {
 	DoCommand(t->tile, DEFAULT_GROUP, t->index, DC_EXEC, CMD_ADD_VEHICLE_GROUP);
@@ -389,84 +349,6 @@ void BreakUpRemainders(Train *t)
 	}
 }
 
-short CountEnginesInChain(Train *t)
-{
-	short count = 0;
-	for (; t != NULL; t = t->GetNextUnit()) {
-		if (HasBit(t->subtype, GVSF_ENGINE)) {
-			count++;
-		}
-	}
-	return count;
-}
-
-int countOccurrencesInTrain(Train *t, EngineID eid)
-{
-	int count = 0;
-	Train *tmp = t;
-	for (; tmp != NULL; tmp = tmp->GetNextUnit()) {
-		if (tmp->engine_type == eid) {
-			count++;
-		}
-	}
-	return count;
-}
-
-int countOccurrencesInTemplateVehicle(TemplateVehicle *contain, EngineID eid)
-{
-	int count = 0;
-	for (; contain; contain=contain->GetNextUnit()) {
-		if (contain->engine_type == eid) {
-			count++;
-		}
-	}
-	return count;
-}
-
-int countOccurrencesInDepot(TileIndex tile, EngineID eid, Train *not_in = NULL)
-{
-	int count = 0;
-	Vehicle *v;
-	FOR_ALL_VEHICLES(v) {
-		// conditions: v is stopped in the given depot, has the right engine and if 'not_in' is given v must not be contained within 'not_in'
-		// if 'not_in' is NULL, no check is needed
-		if (v->tile == tile && v->IsStoppedInDepot() && v->engine_type == eid &&
-				(not_in == 0 || ChainContainsVehicle(not_in, (Train*)v) == false)) {
-			count++;
-		}
-	}
-	return count;
-}
-
-// basically does the same steps as CmdTemplateReplaceVehicle but without actually moving things around
-CommandCost CalculateTemplateReplacementCost(Train *incoming)
-{
-	TileIndex tile = incoming->tile;
-	TemplateVehicle *tv = GetTemplateVehicleByGroupID(incoming->group_id);
-	CommandCost estimate(EXPENSES_NEW_VEHICLES);
-
-	// count for each different eid in the incoming train
-	std::map<EngineID, short> unique_eids;
-	for (TemplateVehicle *tmp = tv; tmp != NULL; tmp = tmp->GetNextUnit()) {
-		unique_eids[tmp->engine_type]++;
-	}
-	std::map<EngineID, short>::iterator it = unique_eids.begin();
-	for (; it != unique_eids.end(); it++) {
-		it->second -= countOccurrencesInTrain(incoming, it->first);
-		it->second -= countOccurrencesInDepot(incoming->tile, it->first, incoming);
-		if (it->second < 0) it->second = 0;
-	}
-
-	// get overall buying cost
-	for (it = unique_eids.begin(); it != unique_eids.end(); it++) {
-		for (int j = 0; j < it->second; j++) {
-			estimate.AddCost(DoCommand(tile, it->first, 0, DC_NONE, CMD_BUILD_VEHICLE));
-		}
-	}
-
-	return estimate;
-}
-
 // make sure the real train wagon has the right cargo
 void CopyWagonStatus(TemplateVehicle *from, Train *to)
 {

src/tbtr_template_vehicle_func.h

@@ -19,31 +19,14 @@
 
 Train* VirtualTrainFromTemplateVehicle(TemplateVehicle* tv, StringID &err);
 
-void DrawTemplateVehicle(const TemplateVehicle*, int, int, int, VehicleID, int, VehicleID);
-
 void BuildTemplateGuiList(GUITemplateList*, Scrollbar*, Owner, RailType);
 
 Money CalculateOverallTemplateCost(const TemplateVehicle*);
 
-void DrawTemplateTrain(const TemplateVehicle*, int, int, int);
-
-SpriteID GetSpriteID(EngineID, bool);
-
 void DrawTemplate(const TemplateVehicle*, int, int, int);
 
-int GetTemplateDisplayImageWidth(EngineID);
-
-TemplateVehicle *CreateNewTemplateVehicle(EngineID);
-
-void setupVirtTrain(const TemplateVehicle*, Train*);
-
 TemplateVehicle* TemplateVehicleFromVirtualTrain(Train *virt);
 
-inline TemplateVehicle* Last(TemplateVehicle*);
-
-TemplateVehicle *DeleteTemplateVehicle(TemplateVehicle*);
-
-Train* DeleteVirtualTrainPart(Train*, Train*);
 Train* DeleteVirtualTrain(Train*, Train *);
 
 CommandCost CmdTemplateReplaceVehicle(Train*, bool, DoCommandFlag);
@@ -63,14 +46,11 @@ Train* DepotContainsEngine(TileIndex, EngineID, Train*);
 
 int NumTrainsNeedTemplateReplacement(GroupID, TemplateVehicle*);
 
-CommandCost CalculateTemplateReplacementCost(Train*);
 CommandCost TestBuyAllTemplateVehiclesInChain(TemplateVehicle *tv, TileIndex tile);
 
 void CmdRefitTrainFromTemplate(Train *t, TemplateVehicle *tv, DoCommandFlag);
 void BreakUpRemainders(Train *t);
 
-short CountEnginesInChain(Train*);
-
 bool TemplateVehicleContainsEngineOfRailtype(const TemplateVehicle*, RailType);
 
 void TransferCargoForTrain(Train*, Train*);