# HG changeset patch
# User peter1138
# Date 1174081331 0
# Node ID 2e690e6fdc03cf10c2f70c39e3641daf58c0aa8d
# Parent  b195931de7fad5ee651e7265351386b99f3b1f81
(svn r9259) -Codechange: NUM_CARGO isn't a valid cargo type...

diff -r b195931de7fa -r 2e690e6fdc03 src/aircraft_cmd.cpp
--- a/src/aircraft_cmd.cpp	Fri Mar 16 17:40:31 2007 +0000
+++ b/src/aircraft_cmd.cpp	Fri Mar 16 21:42:11 2007 +0000
@@ -606,7 +606,7 @@
 
 	/* Check cargo */
 	CargoID new_cid = GB(p2, 0, 8);
-	if (new_cid > NUM_CARGO || !CanRefitTo(v->engine_type, new_cid)) return CMD_ERROR;
+	if (new_cid >= NUM_CARGO || !CanRefitTo(v->engine_type, new_cid)) return CMD_ERROR;
 
 	SET_EXPENSES_TYPE(EXPENSES_AIRCRAFT_RUN);
 
diff -r b195931de7fa -r 2e690e6fdc03 src/roadveh_cmd.cpp
--- a/src/roadveh_cmd.cpp	Fri Mar 16 17:40:31 2007 +0000
+++ b/src/roadveh_cmd.cpp	Fri Mar 16 21:42:11 2007 +0000
@@ -1857,7 +1857,7 @@
 	if (v->type != VEH_ROAD || !CheckOwnership(v->owner)) return CMD_ERROR;
 	if (!IsRoadVehInDepotStopped(v)) return_cmd_error(STR_9013_MUST_BE_STOPPED_INSIDE);
 
-	if (new_cid > NUM_CARGO || !CanRefitTo(v->engine_type, new_cid)) return CMD_ERROR;
+	if (new_cid >= NUM_CARGO || !CanRefitTo(v->engine_type, new_cid)) return CMD_ERROR;
 
 	SET_EXPENSES_TYPE(EXPENSES_ROADVEH_RUN);
 
diff -r b195931de7fa -r 2e690e6fdc03 src/ship_cmd.cpp
--- a/src/ship_cmd.cpp	Fri Mar 16 17:40:31 2007 +0000
+++ b/src/ship_cmd.cpp	Fri Mar 16 21:42:11 2007 +0000
@@ -1098,7 +1098,7 @@
 
 	/* Check cargo */
 	if (!ShipVehInfo(v->engine_type)->refittable) return CMD_ERROR;
-	if (new_cid > NUM_CARGO || !CanRefitTo(v->engine_type, new_cid)) return CMD_ERROR;
+	if (new_cid >= NUM_CARGO || !CanRefitTo(v->engine_type, new_cid)) return CMD_ERROR;
 
 	SET_EXPENSES_TYPE(EXPENSES_SHIP_RUN);
 
diff -r b195931de7fa -r 2e690e6fdc03 src/train_cmd.cpp
--- a/src/train_cmd.cpp	Fri Mar 16 17:40:31 2007 +0000
+++ b/src/train_cmd.cpp	Fri Mar 16 21:42:11 2007 +0000
@@ -1744,7 +1744,7 @@
 	if (CheckTrainStoppedInDepot(v) < 0) return_cmd_error(STR_TRAIN_MUST_BE_STOPPED);
 
 	/* Check cargo */
-	if (new_cid > NUM_CARGO) return CMD_ERROR;
+	if (new_cid >= NUM_CARGO) return CMD_ERROR;
 
 	SET_EXPENSES_TYPE(EXPENSES_TRAIN_RUN);