cpp/openttd-patchpack/source File Diff

File diff r8918:6c77caed2149 → r8919:cac9f783953d

src/order_cmd.cpp

➞

Show inline comments

@@ @@ -355,13 +355,13 @@ CommandCost CmdInsertOrder(TileIndex til @@
 					break;
 				default: return CMD_ERROR;
+			}
 			/* Non stop not allowed for non-trains. */
 			if (new_order.GetNonStopType() != ONSF_STOP_EVERYWHERE && v->type != VEH_TRAIN) return CMD_ERROR;
+			if (new_order.GetNonStopType() != ONSF_STOP_EVERYWHERE && v->type != VEH_TRAIN && v->type != VEH_ROAD) return CMD_ERROR;
 			/* Full load and unload are mutual exclusive. */
 			if ((new_order.GetLoadType() & OLFB_FULL_LOAD) && (new_order.GetUnloadType() & OUFB_UNLOAD)) return CMD_ERROR;
 			/* Filter invalid load/unload types. */
 			switch (new_order.GetLoadType()) {
@@ @@ -409,13 +409,13 @@ CommandCost CmdInsertOrder(TileIndex til @@
+					}
+				}
 			} else {
 				if (!IsPlayerBuildableVehicleType(v)) return CMD_ERROR;
+			}
 			if (new_order.GetNonStopType() != ONSF_STOP_EVERYWHERE && v->type != VEH_TRAIN) return CMD_ERROR;
+			if (new_order.GetNonStopType() != ONSF_STOP_EVERYWHERE && v->type != VEH_TRAIN && v->type != VEH_ROAD) return CMD_ERROR;
 			if (new_order.GetDepotOrderType() & ~ODTFB_PART_OF_ORDERS) return CMD_ERROR;
 			if (new_order.GetDepotActionType() & ~ODATFB_NEAREST_DEPOT) return CMD_ERROR;
 			break;
+		}
 		case OT_GOTO_WAYPOINT: {
@@ @@ -866,12 +866,13 @@ CommandCost CmdModifyOrder(TileIndex til @@
+	}
 	switch (mof) {
 		default: NOT_REACHED();
 		case MOF_NON_STOP:
 			if (v->type != VEH_TRAIN && v->type != VEH_ROAD) return CMD_ERROR;
 			if (data >= ONSF_END) return CMD_ERROR;
 			if (data == order->GetNonStopType()) return CMD_ERROR;
 			break;
 		case MOF_UNLOAD:
 			if ((data & ~(OUFB_UNLOAD | OUFB_TRANSFER | OUFB_NO_UNLOAD)) != 0) return CMD_ERROR;