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

Add function to get name of extended variable ID

Browse Source 
Add table for internal variable IDs which aren't mappable externally
This commit is contained in:
Jonathan G Rennison
2023-06-01 19:26:45 +01:00
parent bdb9a72aa4
commit f7964cb3aa
5 changed files with 68 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/newgrf_spritegroup.cpp
View File

@@ -514,12 +514,9 @@ static char *DumpSpriteGroupAdjust(char *p, const char *last, const Deterministi
};
auto append_extended_var = [&](int var_id) {
extern const GRFVariableMapDefinition _grf_action2_remappable_variables[];
for (const GRFVariableMapDefinition *info = _grf_action2_remappable_variables; info->name != nullptr; info++) {
if (var_id == info->id) {
p += seprintf(p, last, " (%s)", info->name);
break;
}
const char *name = GetExtendedVariableNameById(var_id);
if (name != nullptr) {
p += seprintf(p, last, " (%s)", name);
}
};
@@ -560,9 +557,7 @@ static char *DumpSpriteGroupAdjust(char *p, const char *last, const Deterministi
highlight_tag = (2 << 16) | (adjust.and_mask & 0xFFFF);
}
p += seprintf(p, last, "var: %X", adjust.variable);
if (adjust.variable == A2VRI_VEHICLE_CURRENT_SPEED_SCALED) {
p += seprintf(p, last, " (current_speed_scaled)");
} else if (adjust.variable >= 0x100) {
if (adjust.variable >= 0x100) {
append_extended_var(adjust.variable);
}
if (adjust.variable == 0x7B && adjust.parameter >= 0x100) {