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

Tracerestrict: Fix share/unshare actions setting always reserve through bit incorrectly

Browse Source 
See: #620
This commit is contained in:
Jonathan G Rennison
2023-12-30 14:36:35 +00:00
parent 00a0853550
commit 8256bb8359
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/tracerestrict.cpp
View File

@@ -1748,6 +1748,15 @@ void TraceRestrictCheckRefreshSignals(const TraceRestrictProgram *prog, size_t o
} }
} }
void TraceRestrictCheckRefreshSingleSignal(const TraceRestrictProgram *prog, TraceRestrictRefId ref, TraceRestrictProgramActionsUsedFlags old_actions_used_flags)
{
if (((old_actions_used_flags ^ prog->actions_used_flags) & TRPAUF_RESERVE_THROUGH_ALWAYS)) {
TileIndex tile = GetTraceRestrictRefIdTileIndex(ref);
Track track = GetTraceRestrictRefIdTrack(ref);
if (IsTileType(tile, MP_RAILWAY)) UpdateSignalReserveThroughBit(tile, track, true);
}
}
/** /**
* Gets the signal program for the tile ref @p ref * Gets the signal program for the tile ref @p ref
* An empty program will be constructed if none exists, and @p create_new is true, unless the pool is full * An empty program will be constructed if none exists, and @p create_new is true, unless the pool is full
@@ -2203,6 +2212,7 @@ CommandCost CmdProgramSignalTraceRestrict(TileIndex tile, DoCommandFlag flags, u
if (prog->items.size() == 0 && prog->refcount == 1) { if (prog->items.size() == 0 && prog->refcount == 1) {
// program is empty, and this tile is the only reference to it // program is empty, and this tile is the only reference to it
// so delete it, as it's redundant // so delete it, as it's redundant
TraceRestrictCheckRefreshSingleSignal(prog, MakeTraceRestrictRefId(tile, track), old_actions_used_flags);
TraceRestrictRemoveProgramMapping(MakeTraceRestrictRefId(tile, track)); TraceRestrictRemoveProgramMapping(MakeTraceRestrictRefId(tile, track));
} else { } else {
TraceRestrictCheckRefreshSignals(prog, old_size, old_actions_used_flags); TraceRestrictCheckRefreshSignals(prog, old_size, old_actions_used_flags);
@@ -2327,6 +2337,7 @@ CommandCost CmdProgramSignalTraceRestrictProgMgmt(TileIndex tile, DoCommandFlag
} }
TraceRestrictCreateProgramMapping(self, source_prog); TraceRestrictCreateProgramMapping(self, source_prog);
TraceRestrictCheckRefreshSingleSignal(source_prog, self, static_cast<TraceRestrictProgramActionsUsedFlags>(0));
break; break;
} }
@@ -2350,6 +2361,7 @@ CommandCost CmdProgramSignalTraceRestrictProgMgmt(TileIndex tile, DoCommandFlag
new_prog->items.swap(items); new_prog->items.swap(items);
new_prog->Validate(); new_prog->Validate();
TraceRestrictCheckRefreshSingleSignal(new_prog, self, static_cast<TraceRestrictProgramActionsUsedFlags>(0));
} }
break; break;
} }