dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r4960) - NewGRF: explicitly handle unsupported variables, instead of returning -1.

Browse Source
This commit is contained in:
peter1138
2006-05-23 19:36:50 +00:00
parent f6c5b3e78a
commit ae8f4f8d9a
4 changed files with 34 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
newgrf_engine.c
View File

@@ -476,7 +476,7 @@ static void VehicleSetTriggers(const ResolverObject *object, int triggers)
}
static uint32 VehicleGetVariable(const ResolverObject *object, byte variable, byte parameter)
static uint32 VehicleGetVariable(const ResolverObject *object, byte variable, byte parameter, bool *available)
{
const Vehicle *v = GRV(object);
@@ -487,8 +487,10 @@ static uint32 VehicleGetVariable(const ResolverObject *object, byte variable, by
case 0x46: return 0; /* Motion counter */
case 0xC4: return _cur_year; /* Build year */
case 0xDA: return INVALID_VEHICLE; /* Next vehicle */
default: return -1;
}
*available = false;
return -1;
}
/* Calculated vehicle parameters */
@@ -719,6 +721,7 @@ static uint32 VehicleGetVariable(const ResolverObject *object, byte variable, by
DEBUG(grf, 1)("Unhandled vehicle property 0x%X, type 0x%X", variable, v->type);
*available = false;
return -1;
}