cpp/openttd-patchpack/source Changeset - r2826:0151929b03a8

Changeset - r2826:0151929b03a8

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

truelight - 18 years ago 2006-01-06 21:10:58
truelight@openttd.org

(svn r3374) -Fix: [ FS#36 ] Don't allow trains to get bigger than 100 via drag and drop

1 file changed with 20 insertions and 11 deletions:

train_cmd.c

0 comments (0 inline, 0 general)

train_cmd.c

➞

Show inline comments

@@ @@ -991,19 +991,28 @@ int32 CmdMoveRailVehicle(int x, int y, u @@
 	if (IsMultiheaded(src) && !IsTrainEngine(src)) return_cmd_error(STR_REAR_ENGINE_FOLLOW_FRONT_ERROR);
 	/* check if all vehicles in the source train are stopped inside a depot */
 	if (CheckTrainStoppedInDepot(src_head) < 0) return CMD_ERROR;
 	/* check if all the vehicles in the dest train are stopped,
 	 * and that the length of the dest train is no longer than XXX vehicles */
 	if (dst_head != NULL) {
 		int num = CheckTrainStoppedInDepot(dst_head);
 		if (num < 0) return CMD_ERROR;
+	{
 		int r, num = 0;
 		r = CheckTrainStoppedInDepot(src_head);
 		/* check if all vehicles in the source train are stopped inside a depot */
 		if (r < 0) return CMD_ERROR;
 		num += r;
 		/* check if all the vehicles in the dest train are stopped */
 		if (dst_head != NULL) {
 			r = CheckTrainStoppedInDepot(dst_head);
 			if (r < 0) return CMD_ERROR;
 			num += r;
 			assert(dst_head->tile == src_head->tile);
+		}
 		/* Check that the length of the dest train is no longer than XXX vehicles */
 		if (num > (_patches.mammoth_trains ? 100 : 9) && IsFrontEngine(dst_head))
 			return_cmd_error(STR_8819_TRAIN_TOO_LONG);
 		assert(dst_head->tile == src_head->tile);
+	}
 	// when moving all wagons, we can't have the same src_head and dst_head

0 comments (0 inline, 0 general)