mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r18380) -Fix (r9301): One could not share orders between buses carrying different cargos.

release/1.0
frosch 2009-12-02 17:35:54 +00:00
parent 9426f2b173
commit 2265202d77
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/order_cmd.cpp
View File

@ -1140,9 +1140,8 @@ CommandCost CmdCloneOrder(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32
} }
/* Trucks can't share orders with busses (and visa versa) */ /* Trucks can't share orders with busses (and visa versa) */
if (src->type == VEH_ROAD) { if (src->type == VEH_ROAD && IsCargoInClass(src->cargo_type, CC_PASSENGERS) != IsCargoInClass(dst->cargo_type, CC_PASSENGERS)) {
if (src->cargo_type != dst->cargo_type && (IsCargoInClass(src->cargo_type, CC_PASSENGERS) || IsCargoInClass(dst->cargo_type, CC_PASSENGERS))) return CMD_ERROR;
return CMD_ERROR;
} }
/* Is the vehicle already in the shared list? */ /* Is the vehicle already in the shared list? */