# HG changeset patch
# User maedhros <maedhros@openttd.org>
# Date 2007-03-06 19:12:56
# Node ID c374d167eb95fcdc48651e1f070751203bc3a9e9
# Parent  6350e47be929b316bcf1790eac884b2016140b3e

(svn r9029) -Fix (r7326): Only call the gradual loading amount callback if the bit for it is set in the vehicle's callbackmask.

diff --git a/src/economy.cpp b/src/economy.cpp
--- a/src/economy.cpp
+++ b/src/economy.cpp
@@ -1368,7 +1368,7 @@ int LoadUnloadVehicle(Vehicle *v, bool j
 	for (; v != NULL; v = v->next) {
 		GoodsEntry* ge;
 		load_amount = EngInfo(v->engine_type)->load_amount;
-		if (_patches.gradual_loading) {
+		if (_patches.gradual_loading && HASBIT(EngInfo(v->engine_type)->callbackmask, CBM_LOAD_AMOUNT)) {
 			uint16 cb_load_amount = GetVehicleCallback(CBID_VEHICLE_LOAD_AMOUNT, 0, 0, v->engine_type, v);
 			if (cb_load_amount != CALLBACK_FAILED) load_amount = cb_load_amount & 0xFF;
 		}
diff --git a/src/newgrf_callbacks.h b/src/newgrf_callbacks.h
--- a/src/newgrf_callbacks.h
+++ b/src/newgrf_callbacks.h
@@ -19,8 +19,8 @@ enum CallbackID {
 	// only for train vehicles
 	CBID_TRAIN_VEHICLE_LENGTH       = 0x11,
 
-	/* Called to determine the amount of cargo to load per unit of time when
-	 * using gradual loading. */
+	/* Called (if appropriate bit in callback mask is set) to determine the
+	 * amount of cargo to load per unit of time when using gradual loading. */
 	CBID_VEHICLE_LOAD_AMOUNT        = 0x12,
 
 	/* Called (if appropriate bit in callback mask is set) to determine if a