From edc2a62669516a58165e670fecafdcf7e2bc9a5f Mon Sep 17 00:00:00 2001 From: rubidium Date: Sun, 14 Oct 2007 19:13:38 +0000 Subject: (svn r11258) -Fix [FS#1325]: if a Load Amount callback returns 0, it means (according to TTDP's source code, not "the" specs) that it should take the "default" one. --- 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 e4b9eb623..188b803e6 100644 --- a/src/economy.cpp +++ b/src/economy.cpp @@ -1525,7 +1525,7 @@ static void LoadUnloadVehicle(Vehicle *v, int *cargo_left) byte load_amount = EngInfo(v->engine_type)->load_amount; if (_patches.gradual_loading && HASBIT(EngInfo(v->engine_type)->callbackmask, CBM_VEHICLE_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; + if (cb_load_amount != CALLBACK_FAILED && cb_load_amount != 0) load_amount = cb_load_amount & 0xFF; } GoodsEntry *ge = &st->goods[v->cargo_type]; -- cgit v1.2.3-54-g00ecf