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

Vehicle list commands now take into account cargo type filter

Browse Source 
Start/stop
Send to depot type commands
Add to new group
Change order target
This commit is contained in:
Jonathan G Rennison
2022-11-19 22:40:29 +00:00
parent 728b902e9f
commit 03a9912a2b
10 changed files with 88 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/group_cmd.cpp
View File

@@ -517,7 +517,8 @@ CommandCost CmdAlterGroup(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32
* @param tile unused
* @param flags type of operation
* @param p1 packed VehicleListIdentifier
* @param p2 unused
* @param p2 bitmask
* - bit 0-7 Cargo filter
* @param text the new name or an empty string when setting to the default
* @return the cost of this operation or an error
*/
@@ -527,7 +528,7 @@ CommandCost CmdCreateGroupFromList(TileIndex tile, DoCommandFlag flags, uint32 p
VehicleList list;
if (!vli.UnpackIfValid(p1)) return CMD_ERROR;
if (!IsCompanyBuildableVehicleType(vli.vtype)) return CMD_ERROR;
if (!GenerateVehicleSortList(&list, vli)) return CMD_ERROR;
if (!GenerateVehicleSortList(&list, vli, GB(p2, 0, 8))) return CMD_ERROR;
CommandCost ret = DoCommand(tile, vli.vtype, INVALID_GROUP, flags, CMD_CREATE_GROUP);
if (ret.Failed()) return ret;