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

Debug: Change output format of scope_dumper::VehicleInfo

Browse Source
This commit is contained in:
Jonathan G Rennison
2024-01-06 16:04:02 +00:00
parent 107b73c2b8
commit 5294f1d7f7
1 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/scope_info.cpp
View File

@@ -62,30 +62,36 @@ const char *scope_dumper::VehicleInfo(const Vehicle *v)
auto dump_flags = [&](const Vehicle *u) { auto dump_flags = [&](const Vehicle *u) {
b = u->DumpVehicleFlags(b, last, true); b = u->DumpVehicleFlags(b, last, true);
}; };
auto dump_name = [&](const Vehicle *u) {
if (u->type < VEH_COMPANY_END) {
const char *veh_type[] = {
"Train",
"Road Vehicle",
"Ship",
"Aircraft",
};
b = strecpy(b, veh_type[u->type], last, true);
if (u->unitnumber > 0) {
b += seprintf(b, last, " %u", u->unitnumber);
} else {
b += seprintf(b, last, " [N/A]");
}
if (!u->name.empty()) {
b += seprintf(b, last, " (%s)", u->name.c_str());
}
} else if (u->type == VEH_EFFECT) {
b += seprintf(b, last, "Effect Vehicle: subtype: %u", u->subtype);
} else if (u->type == VEH_DISASTER) {
b += seprintf(b, last, "Disaster Vehicle: subtype: %u", u->subtype);
}
};
if (v) { if (v) {
b += seprintf(b, last, "veh: %u: (", v->index); b += seprintf(b, last, "veh: %u: (", v->index);
if (Vehicle::GetIfValid(v->index) != v) { if (Vehicle::GetIfValid(v->index) != v) {
b += seprintf(b, last, "INVALID PTR: %p)", v); b += seprintf(b, last, "INVALID PTR: %p)", v);
return this->buffer; return this->buffer;
} }
switch (v->type) { dump_name(v);
case VEH_EFFECT:
b += seprintf(b, last, "Effect Vehicle: subtype: %u", v->subtype);
break;
case VEH_DISASTER:
b += seprintf(b, last, "Disaster Vehicle: subtype: %u", v->subtype);
break;
default:
SetDParam(0, v->index);
b = strecpy(b, GetString(STR_VEHICLE_NAME).c_str(), last);
break;
}
if (v->type < VEH_COMPANY_END) {
const char veh_type_chars[] = "TRSA";
b += seprintf(b, last, ", (%c%u)", veh_type_chars[v->type], v->unitnumber);
}
b += seprintf(b, last, ", c:%d, ", (int) v->owner); b += seprintf(b, last, ", c:%d, ", (int) v->owner);
dump_flags(v); dump_flags(v);
if (v->First() && v->First() != v) { if (v->First() && v->First() != v) {
@@ -94,8 +100,7 @@ const char *scope_dumper::VehicleInfo(const Vehicle *v)
b += seprintf(b, last, "INVALID PTR: %p)", v->First()); b += seprintf(b, last, "INVALID PTR: %p)", v->First());
return this->buffer; return this->buffer;
} }
SetDParam(0, v->First()->index); dump_name(v->First());
b = strecpy(b, GetString(STR_VEHICLE_NAME).c_str(), last);
b += seprintf(b, last, ", "); b += seprintf(b, last, ", ");
dump_flags(v->First()); dump_flags(v->First());
b += seprintf(b, last, ")"); b += seprintf(b, last, ")");