From bbe13a0623eea9f46353fca57a35ae745040fbaf Mon Sep 17 00:00:00 2001 From: rubidium Date: Mon, 21 Apr 2008 13:45:03 +0000 Subject: (svn r12818) -Codechange: make callbacks 31 and 37 behave like they do in TTDP according to frosch's survey. --- src/industry_gui.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/industry_gui.cpp') diff --git a/src/industry_gui.cpp b/src/industry_gui.cpp index 958ab5a97..9df7ac4b5 100644 --- a/src/industry_gui.cpp +++ b/src/industry_gui.cpp @@ -78,8 +78,8 @@ static StringID GetCargoSuffix(uint cargo, Industry *ind, IndustryType ind_type, { if (HasBit(indspec->callback_flags, CBM_IND_CARGO_SUFFIX)) { bool fund = ind == NULL; - uint8 callback = GetIndustryCallback(CBID_INDUSTRY_CARGO_SUFFIX, 0, ((!fund) ? 1 << 8 : 0) | cargo, ind, ind_type, (!fund) ? ind->xy : INVALID_TILE); - if (callback != 0xFF) return GetGRFStringID(indspec->grf_prop.grffile->grfid, 0xD000 + callback); + uint16 callback = GetIndustryCallback(CBID_INDUSTRY_CARGO_SUFFIX, 0, ((!fund) ? 1 << 8 : 0) | cargo, ind, ind_type, (!fund) ? ind->xy : INVALID_TILE); + if (GB(callback, 0, 8) != 0xFF) return GetGRFStringID(indspec->grf_prop.grffile->grfid, 0xD000 + callback); } return STR_EMPTY; } -- cgit v1.2.3-54-g00ecf