From eb8ef65a0baa709214f913757eef77154a1bc1b8 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Sun, 15 Sep 2019 00:41:45 +0100 Subject: [PATCH] CheckCaches: Indicate incorrect fields in vehicle cache mismatch message --- src/openttd.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/openttd.cpp b/src/openttd.cpp index 012c1376e9..27336705ce 100644 --- a/src/openttd.cpp +++ b/src/openttd.cpp @@ -1568,7 +1568,12 @@ void CheckCaches(bool force_check, std::function log) } if (veh_cache[length].cached_max_speed != u->vcache.cached_max_speed || veh_cache[length].cached_cargo_age_period != u->vcache.cached_cargo_age_period || veh_cache[length].cached_vis_effect != u->vcache.cached_vis_effect || HasBit(veh_cache[length].cached_veh_flags ^ u->vcache.cached_veh_flags, VCF_LAST_VISUAL_EFFECT)) { - CCLOG("vehicle cache mismatch: type %i, vehicle %i, company %i, unit number %i, wagon %i", (int)v->type, v->index, (int)v->owner, v->unitnumber, length); + CCLOG("vehicle cache mismatch: %c%c%c%c, type %i, vehicle %i, company %i, unit number %i, wagon %i", + veh_cache[length].cached_max_speed != u->vcache.cached_max_speed ? 'm' : '-', + veh_cache[length].cached_cargo_age_period != u->vcache.cached_cargo_age_period ? 'c' : '-', + veh_cache[length].cached_vis_effect != u->vcache.cached_vis_effect ? 'v' : '-', + HasBit(veh_cache[length].cached_veh_flags ^ u->vcache.cached_veh_flags, VCF_LAST_VISUAL_EFFECT) ? 'l' : '-', + (int)v->type, v->index, (int)v->owner, v->unitnumber, length); } if (u->IsGroundVehicle() && (HasBit(u->GetGroundVehicleFlags(), GVF_GOINGUP_BIT) || HasBit(u->GetGroundVehicleFlags(), GVF_GOINGDOWN_BIT)) && u->GetGroundVehicleCache()->cached_slope_resistance && HasBit(v->vcache.cached_veh_flags, VCF_GV_ZERO_SLOPE_RESIST)) { CCLOG("VCF_GV_ZERO_SLOPE_RESIST set incorrectly (2): type %i, vehicle %i, company %i, unit number %i, wagon %i", (int)v->type, v->index, (int)v->owner, v->unitnumber, length);