From 3ebf8a297e6320d3cdf771fdf7393c1fb1e79fc9 Mon Sep 17 00:00:00 2001 From: rubidium Date: Thu, 9 Sep 2010 14:39:48 +0000 Subject: (svn r20776) -Codechange: make VehicleLists for the group "ALL_GROUP" work as well --- src/vehiclelist.cpp | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/vehiclelist.cpp b/src/vehiclelist.cpp index a0415969b..5303e1904 100644 --- a/src/vehiclelist.cpp +++ b/src/vehiclelist.cpp @@ -139,6 +139,18 @@ bool GenerateVehicleSortList(VehicleList *list, const VehicleListIdentifier &vli } break; + case VL_GROUP_LIST: + if (vli.index != ALL_GROUP) { + FOR_ALL_VEHICLES(v) { + if (v->type == vli.vtype && v->IsPrimaryVehicle() && + v->owner == vli.company && v->group_id == vli.index) { + *list->Append() = v; + } + } + break; + } + /* FALL THROUGH */ + case VL_STANDARD: FOR_ALL_VEHICLES(v) { if (v->type == vli.vtype && v->owner == vli.company && v->IsPrimaryVehicle()) { @@ -162,15 +174,6 @@ bool GenerateVehicleSortList(VehicleList *list, const VehicleListIdentifier &vli } break; - case VL_GROUP_LIST: - FOR_ALL_VEHICLES(v) { - if (v->type == vli.vtype && v->IsPrimaryVehicle() && - v->owner == vli.company && v->group_id == vli.index) { - *list->Append() = v; - } - } - break; - default: return false; } -- cgit v1.2.3-70-g09d2