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

Add scope info logging to LoadUnloadStation

Browse Source
This commit is contained in:
Jonathan G Rennison
2018-05-31 18:37:08 +01:00
parent faf4cdc0f4
commit bb8c18b017
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/scope_info.cpp
View File

@@ -87,7 +87,8 @@ const char *scope_dumper::StationInfo(const BaseStation *st)
if (st) { if (st) {
const bool waypoint = Waypoint::IsExpected(st); const bool waypoint = Waypoint::IsExpected(st);
b += seprintf(b, last, "%s: %u: ", waypoint ? "waypoint" : "station", st->index); 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 = GetString(b, waypoint ? STR_WAYPOINT_NAME : STR_STATION_NAME, last);
b += seprintf(b, last, ", c:%d, facil: ", (int) st->owner); b += seprintf(b, last, ", c:%d, facil: ", (int) st->owner);
auto dump_facil = [&](char c, StationFacility flag) { auto dump_facil = [&](char c, StationFacility flag) {
@@ -99,6 +100,7 @@ const char *scope_dumper::StationInfo(const BaseStation *st)
dump_facil('A', FACIL_AIRPORT); dump_facil('A', FACIL_AIRPORT);
dump_facil('D', FACIL_DOCK); dump_facil('D', FACIL_DOCK);
dump_facil('W', FACIL_WAYPOINT); dump_facil('W', FACIL_WAYPOINT);
b += seprintf(b, last, ")");
} else { } else {
b += seprintf(b, last, "station/waypoint: NULL"); b += seprintf(b, last, "station/waypoint: NULL");
} }

5
src/vehicle.cpp
View File

@@ -951,8 +951,11 @@ void CallVehicleTicks()
RunVehicleDayProc(); RunVehicleDayProc();
Station *st; {
Station *st = nullptr;
SCOPE_INFO_FMT([&st], "CallVehicleTicks: LoadUnloadStation: %s", scope_dumper().StationInfo(st));
FOR_ALL_STATIONS(st) LoadUnloadStation(st); FOR_ALL_STATIONS(st) LoadUnloadStation(st);
}
Vehicle *v = NULL; Vehicle *v = NULL;
SCOPE_INFO_FMT([&v], "CallVehicleTicks: %s", scope_dumper().VehicleInfo(v)); SCOPE_INFO_FMT([&v], "CallVehicleTicks: %s", scope_dumper().VehicleInfo(v));