Merge branch 'tracerestrict' into jgrpp

This commit is contained in:
Jonathan G Rennison
2019-08-19 20:14:05 +01:00

View File

@@ -870,8 +870,8 @@ void SetTraceRestrictValueDefault(TraceRestrictItem &item, TraceRestrictValueTyp
break; break;
case TRVT_CARGO_ID: case TRVT_CARGO_ID:
assert(_sorted_standard_cargo_specs_size > 0); assert(_standard_cargo_mask != 0);
SetTraceRestrictValue(item, _sorted_cargo_specs[0]->Index()); SetTraceRestrictValue(item, FindFirstBit64(_standard_cargo_mask));
SetTraceRestrictAuxField(item, 0); SetTraceRestrictAuxField(item, 0);
break; break;