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

Debug: Add road/tram type support to NewGRF debug window

Browse Source
This commit is contained in:
Jonathan G Rennison
2020-10-16 18:42:47 +01:00
parent 0d61ae9567
commit 6c9988f28b
3 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/lang/english.txt
View File

@@ -3646,6 +3646,7 @@ STR_NEWGRF_INSPECT_PARENT_TOOLTIP :{BLACK}Inspect
STR_NEWGRF_INSPECT_CAPTION_OBJECT_AT :{STRING1} at {HEX} STR_NEWGRF_INSPECT_CAPTION_OBJECT_AT :{STRING1} at {HEX}
STR_NEWGRF_INSPECT_CAPTION_OBJECT_AT_OBJECT :Object STR_NEWGRF_INSPECT_CAPTION_OBJECT_AT_OBJECT :Object
STR_NEWGRF_INSPECT_CAPTION_OBJECT_AT_RAIL_TYPE :Rail type STR_NEWGRF_INSPECT_CAPTION_OBJECT_AT_RAIL_TYPE :Rail type
STR_NEWGRF_INSPECT_CAPTION_OBJECT_AT_ROAD_TYPE :Road/tram type
STR_NEWGRF_INSPECT_QUERY_CAPTION :{WHITE}NewGRF variable 60+x parameter (hexadecimal) STR_NEWGRF_INSPECT_QUERY_CAPTION :{WHITE}NewGRF variable 60+x parameter (hexadecimal)

2
src/newgrf_debug_gui.cpp
View File

@@ -806,7 +806,7 @@ GrfSpecFeature GetGrfSpecFeature(TileIndex tile)
switch (GetTileType(tile)) { switch (GetTileType(tile)) {
default: return GSF_INVALID; default: return GSF_INVALID;
case MP_RAILWAY: return GSF_RAILTYPES; case MP_RAILWAY: return GSF_RAILTYPES;
case MP_ROAD: return IsLevelCrossing(tile) ? GSF_RAILTYPES : GSF_INVALID; case MP_ROAD: return IsLevelCrossing(tile) ? GSF_RAILTYPES : GSF_ROADTYPES;
case MP_HOUSE: return GSF_HOUSES; case MP_HOUSE: return GSF_HOUSES;
case MP_INDUSTRY: return GSF_INDUSTRYTILES; case MP_INDUSTRY: return GSF_INDUSTRYTILES;
case MP_OBJECT: return GSF_OBJECTS; case MP_OBJECT: return GSF_OBJECTS;

36
src/table/newgrf_debug_data.h
View File

@@ -832,7 +832,7 @@ class NIHRoadType : public NIHelper {
uint GetParent(uint index) const override { return UINT32_MAX; } uint GetParent(uint index) const override { return UINT32_MAX; }
const void *GetInstance(uint index) const override { return nullptr; } const void *GetInstance(uint index) const override { return nullptr; }
const void *GetSpec(uint index) const override { return nullptr; } const void *GetSpec(uint index) const override { return nullptr; }
void SetStringParameters(uint index) const override { this->SetObjectAtStringParameters(STR_NEWGRF_INSPECT_CAPTION_OBJECT_AT_RAIL_TYPE, INVALID_STRING_ID, index); } void SetStringParameters(uint index) const override { this->SetObjectAtStringParameters(STR_NEWGRF_INSPECT_CAPTION_OBJECT_AT_ROAD_TYPE, INVALID_STRING_ID, index); }
uint32 GetGRFID(uint index) const override { return 0; } uint32 GetGRFID(uint index) const override { return 0; }
uint Resolve(uint index, uint var, uint param, GetVariableExtra *extra) const override uint Resolve(uint index, uint var, uint param, GetVariableExtra *extra) const override
@@ -842,6 +842,31 @@ class NIHRoadType : public NIHelper {
RoadTypeResolverObject ro(nullptr, index, TCX_NORMAL, ROTSG_END); RoadTypeResolverObject ro(nullptr, index, TCX_NORMAL, ROTSG_END);
return ro.GetScope(VSG_SCOPE_SELF)->GetVariable(var, param, extra); return ro.GetScope(VSG_SCOPE_SELF)->GetVariable(var, param, extra);
} }
void ExtraInfo(uint index, std::function<void(const char *)> print) const override
{
print("Debug Info:");
auto writeInfo = [&](RoadTramType rtt) {
RoadType type = GetRoadType(index, rtt);
if (type == INVALID_ROADTYPE) return;
char buffer[1024];
const RoadTypeInfo* rti = GetRoadTypeInfo(type);
seprintf(buffer, lastof(buffer), " %s Type: %u (0x" OTTD_PRINTFHEX64 ")", rtt == RTT_TRAM ? "Tram" : "Road", type, (static_cast<RoadTypes>(1) << type));
print(buffer);
seprintf(buffer, lastof(buffer), " Flags: %c%c%c%c%c",
HasBit(rti->flags, ROTF_CATENARY) ? 'c' : '-',
HasBit(rti->flags, ROTF_NO_LEVEL_CROSSING) ? 'l' : '-',
HasBit(rti->flags, ROTF_NO_HOUSES) ? 'X' : '-',
HasBit(rti->flags, ROTF_HIDDEN) ? 'h' : '-',
HasBit(rti->flags, ROTF_TOWN_BUILD) ? 'T' : '-');
print(buffer);
seprintf(buffer, lastof(buffer), " Powered: 0x" OTTD_PRINTFHEX64, rti->powered_roadtypes);
print(buffer);
};
writeInfo(RTT_ROAD);
writeInfo(RTT_TRAM);
}
}; };
static const NIFeature _nif_roadtype = { static const NIFeature _nif_roadtype = {
@@ -851,13 +876,6 @@ static const NIFeature _nif_roadtype = {
new NIHRoadType(), new NIHRoadType(),
}; };
static const NIFeature _nif_tramtype = {
nullptr,
nullptr,
_niv_roadtypes,
new NIHRoadType(),
};
/** Table with all NIFeatures. */ /** Table with all NIFeatures. */
static const NIFeature * const _nifeatures[] = { static const NIFeature * const _nifeatures[] = {
&_nif_vehicle, // GSF_TRAINS &_nif_vehicle, // GSF_TRAINS
@@ -879,7 +897,7 @@ static const NIFeature * const _nifeatures[] = {
&_nif_railtype, // GSF_RAILTYPES &_nif_railtype, // GSF_RAILTYPES
&_nif_airporttile, // GSF_AIRPORTTILES &_nif_airporttile, // GSF_AIRPORTTILES
&_nif_roadtype, // GSF_ROADTYPES &_nif_roadtype, // GSF_ROADTYPES
&_nif_tramtype, // GSF_TRAMTYPES &_nif_roadtype, // GSF_TRAMTYPES
&_nif_town, // GSF_FAKE_TOWNS &_nif_town, // GSF_FAKE_TOWNS
&_nif_station_struct, // GSF_FAKE_STATION_STRUCT &_nif_station_struct, // GSF_FAKE_STATION_STRUCT
}; };