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

15 years ago · a3bd5f5234
parent 4ddbe1793e
commit a3bd5f5234
1 changed files with 2 additions and 3 deletions
--- a/src/order_cmd.cpp
+++ b/src/order_cmd.cpp
@ -1140,9 +1140,8 @@ CommandCost CmdCloneOrder(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32
 			}

 			/* Trucks can't share orders with busses (and visa versa) */
-			if (src->type == VEH_ROAD) {
-				if (src->cargo_type != dst->cargo_type && (IsCargoInClass(src->cargo_type, CC_PASSENGERS) || IsCargoInClass(dst->cargo_type, CC_PASSENGERS)))
-					return CMD_ERROR;
+			if (src->type == VEH_ROAD && IsCargoInClass(src->cargo_type, CC_PASSENGERS) != IsCargoInClass(dst->cargo_type, CC_PASSENGERS)) {
+				return CMD_ERROR;
 			}

 			/* Is the vehicle already in the shared list? */