gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-02-11 16:54:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r22867) -Fix (r12122): Variables 40 and 81 of callback 18 are not the same as 80.

Browse Source
This commit is contained in:
frosch 2011-09-01 19:43:37 +00:00
parent cbf3bae992
commit c9765caf6a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/newgrf_generic.cpp
View File

@ -85,10 +85,10 @@ static void GenericCallbackSetTriggers(const ResolverObject *object, int trigger
static uint32 GenericCallbackGetVariable(const ResolverObject *object, byte variable, byte parameter, bool *available) static uint32 GenericCallbackGetVariable(const ResolverObject *object, byte variable, byte parameter, bool *available)
{ {
switch (variable) { switch (variable) {
case 0x40: return object->u.generic.cargo_type; case 0x40: return object->grffile->cargo_map[object->u.generic.cargo_type];
case 0x80: return object->u.generic.cargo_type; case 0x80: return object->u.generic.cargo_type;
case 0x81: return object->u.generic.cargo_type; case 0x81: return CargoSpec::Get(object->u.generic.cargo_type)->bitnum;
case 0x82: return object->u.generic.default_selection; case 0x82: return object->u.generic.default_selection;
case 0x83: return object->u.generic.src_industry; case 0x83: return object->u.generic.src_industry;
case 0x84: return object->u.generic.dst_industry; case 0x84: return object->u.generic.dst_industry;