From 60703d36918f807be207c4e5a17dd5fee90f13a2 Mon Sep 17 00:00:00 2001
From: maedhros <maedhros@openttd.org>
Date: Tue, 6 Mar 2007 19:12:56 +0000
Subject: (svn r9029) -Fix (r7326): Only call the gradual loading amount
 callback if the bit for it is set in the vehicle's callbackmask.

---
 src/economy.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/economy.cpp')

diff --git a/src/economy.cpp b/src/economy.cpp
index b7eb0c65f..47246f7c5 100644
--- a/src/economy.cpp
+++ b/src/economy.cpp
@@ -1368,7 +1368,7 @@ int LoadUnloadVehicle(Vehicle *v, bool just_arrived)
 	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;
 		}
-- 
cgit v1.2.3-54-g00ecf