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

TBTR: Remove partial implementation of all-group replacement.

Browse Source
This commit is contained in:
Jonathan G Rennison
2017-01-21 01:17:36 +00:00
parent e79541b166
commit 4800e47270
1 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/tbtr_template_vehicle_func.cpp
View File

@@ -213,22 +213,13 @@ Train* DeleteVirtualTrain(Train *chain, Train *to_del) {
// retrieve template vehicle from templatereplacement that belongs to the given group // retrieve template vehicle from templatereplacement that belongs to the given group
TemplateVehicle* GetTemplateVehicleByGroupID(GroupID gid) { TemplateVehicle* GetTemplateVehicleByGroupID(GroupID gid) {
if (gid >= NEW_GROUP) return NULL;
TemplateReplacement *tr; TemplateReplacement *tr;
// first try to find a templatereplacement issued for the given groupid
FOR_ALL_TEMPLATE_REPLACEMENTS(tr) { FOR_ALL_TEMPLATE_REPLACEMENTS(tr) {
if (tr->Group() == gid) { if (tr->Group() == gid) {
return TemplateVehicle::GetIfValid(tr->Template()); // there can be only one return TemplateVehicle::GetIfValid(tr->Template()); // there can be only one
} }
} }
// if that didn't work, try to find a templatereplacement for ALL_GROUP
if (gid != ALL_GROUP) {
FOR_ALL_TEMPLATE_REPLACEMENTS(tr) {
if (tr->Group() == ALL_GROUP) {
return TemplateVehicle::GetIfValid(tr->Template());
}
}
}
// if all failed, just return null
return NULL; return NULL;
} }