mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r4821) - NewGRF: simplify parameter retrieval in Action 0x0D

This commit is contained in:
peter1138 2006-05-11 09:54:11 +00:00
parent b0f096a7a5
commit 151e79231d
1 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
newgrf.c
View File

@ -1940,11 +1940,15 @@ static uint32 GetParamVal(byte param, uint32 *cond_val)
case 0x84: /* .grf loading stage, 0=initialization, 1=activation */ case 0x84: /* .grf loading stage, 0=initialization, 1=activation */
return _cur_stage; return _cur_stage;
case 0x85: { /* TTDPatch flags, only for bit tests */ case 0x85: /* TTDPatch flags, only for bit tests */
uint32 param_val = _ttdpatch_flags[*cond_val / 0x20]; if (cond_val == NULL) {
*cond_val %= 0x20; /* Supported in Action 0x07 and 0x09, not 0x0D */
return param_val; return 0;
} } else {
uint32 param_val = _ttdpatch_flags[*cond_val / 0x20];
*cond_val %= 0x20;
return param_val;
}
case 0x86: /* road traffic side, bit 4 clear=left, set=right */ case 0x86: /* road traffic side, bit 4 clear=left, set=right */
return _opt.road_side << 4; return _opt.road_side << 4;
@ -1980,7 +1984,6 @@ static uint32 GetParamVal(byte param, uint32 *cond_val)
grfmsg(GMS_WARN, "Unsupported in-game variable 0x%02X.", param); grfmsg(GMS_WARN, "Unsupported in-game variable 0x%02X.", param);
return -1; return -1;
} }
} }
/* Action 0x07 */ /* Action 0x07 */
@ -2304,7 +2307,7 @@ static void ParamSet(byte *buf, int len)
if (GB(data, 0, 8) == 0xFF) { if (GB(data, 0, 8) == 0xFF) {
if (data == 0x0000FFFF) { if (data == 0x0000FFFF) {
/* Patch variables */ /* Patch variables */
grfmsg(GMS_WARN, "ParamSet: Reading Patch variables unsupport."); grfmsg(GMS_WARN, "ParamSet: Reading Patch variables unsupported.");
return; return;
} else { } else {
/* GRF Resource Management */ /* GRF Resource Management */
@ -2326,19 +2329,8 @@ static void ParamSet(byte *buf, int len)
* variables available in action 7, or they can be FF to use the value * variables available in action 7, or they can be FF to use the value
* of <data>. If referring to parameters that are undefined, a value * of <data>. If referring to parameters that are undefined, a value
* of 0 is used instead. */ * of 0 is used instead. */
if (src1 == 0xFF) { src1 = (src1 == 0xFF) ? data : GetParamVal(src1, NULL);
src1 = data; src2 = (src2 == 0xFF) ? data : GetParamVal(src2, NULL);
} else {
uint32 temp;
src1 = GetParamVal(src1, &temp);
}
if (src2 == 0xFF) {
src2 = data;
} else {
uint32 temp;
src2 = GetParamVal(src2, &temp);
}
} }
/* TODO: You can access the parameters of another GRF file by using /* TODO: You can access the parameters of another GRF file by using