Merge branch 'crashlog_improvements' into jgrpp

This commit is contained in:
Jonathan G Rennison
2018-05-31 23:04:47 +01:00
3 changed files with 36 additions and 2 deletions

View File

@@ -15,6 +15,8 @@
#include "strings_func.h"
#include "company_base.h"
#include "vehicle_base.h"
#include "station_base.h"
#include "waypoint_base.h"
#include "table/strings.h"
#include "safeguards.h"
@@ -106,4 +108,31 @@ const char *scope_dumper::VehicleInfo(const Vehicle *v)
return this->buffer;
}
const char *scope_dumper::StationInfo(const BaseStation *st)
{
char *b = this->buffer;
const char *last = lastof(this->buffer);
if (st) {
const bool waypoint = Waypoint::IsExpected(st);
b += seprintf(b, last, "%s: %u: (", waypoint ? "waypoint" : "station", st->index);
SetDParam(0, st->index);
b = GetString(b, waypoint ? STR_WAYPOINT_NAME : STR_STATION_NAME, last);
b += seprintf(b, last, ", c:%d, facil: ", (int) st->owner);
auto dump_facil = [&](char c, StationFacility flag) {
if (st->facilities & flag) b += seprintf(b, last, "%c", c);
};
dump_facil('R', FACIL_TRAIN);
dump_facil('T', FACIL_TRUCK_STOP);
dump_facil('B', FACIL_BUS_STOP);
dump_facil('A', FACIL_AIRPORT);
dump_facil('D', FACIL_DOCK);
dump_facil('W', FACIL_WAYPOINT);
b += seprintf(b, last, ")");
} else {
b += seprintf(b, last, "station/waypoint: NULL");
}
return this->buffer;
}
#endif