From 2265202d7764d861fd3f85d10fd550cf39ba2037 Mon Sep 17 00:00:00 2001 From: frosch Date: Wed, 2 Dec 2009 17:35:54 +0000 Subject: (svn r18380) -Fix (r9301): One could not share orders between buses carrying different cargos. --- src/order_cmd.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/order_cmd.cpp b/src/order_cmd.cpp index 7764ac76d..0573ea655 100644 --- 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? */ -- cgit v1.2.3-70-g09d2