diff options
| author | frosch <frosch@openttd.org> | 2008-03-11 12:55:41 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2008-03-11 12:55:41 +0000 |
| commit | 3eaf7af980979d2cc09eecb15a98a2528ee3c21a (patch) | |
| tree | e5df166b12ad3d52a8d80efe081b2a7b2f92f236 /src/newgrf_spritegroup.cpp | |
| parent | c9c870b768ac2c98fbb022dcbb03338262a85128 (diff) | |
| download | openttd-3eaf7af980979d2cc09eecb15a98a2528ee3c21a.tar.xz | |
(svn r12358) -Fix: Callback 2F returns 15 bit results starting from grf version 7.
Diffstat (limited to 'src/newgrf_spritegroup.cpp')
| -rw-r--r-- | src/newgrf_spritegroup.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/newgrf_spritegroup.cpp b/src/newgrf_spritegroup.cpp index b64c784b3..056d949a2 100644 --- a/src/newgrf_spritegroup.cpp +++ b/src/newgrf_spritegroup.cpp @@ -83,7 +83,7 @@ TemporaryStorageArray<uint32, 0x110> _temp_store; static inline bool Is8BitCallback(const ResolverObject *object) { /* Var 0x7E procedure results are always 15 bit */ - if (object == NULL | object->procedure_call) return false; + if (object == NULL || object->procedure_call) return false; switch (object->callback) { /* All these functions are 15 bit callbacks */ @@ -96,6 +96,7 @@ static inline bool Is8BitCallback(const ResolverObject *object) case CBID_INDTILE_ACCEPT_CARGO: case CBID_VEHICLE_COLOUR_MAPPING: case CBID_HOUSE_PRODUCE_CARGO: + case CBID_INDTILE_SHAPE_CHECK: // depends on grf version, masked to 8 bit in PerformIndustryTileSlopeCheck() if needed case CBID_VEHICLE_SOUND_EFFECT: case CBID_VEHICLE_MODIFY_PROPERTY: // depends on queried property case CBID_CARGO_PROFIT_CALC: |