|
|
|
@ -88,7 +88,7 @@ SignalState GetBridgeEntranceSimulatedSignalStateExtended(TileIndex t, uint16 si
|
|
|
|
|
const auto it = _long_bridge_signal_sim_map.find(t);
|
|
|
|
|
if (it != _long_bridge_signal_sim_map.end()) {
|
|
|
|
|
const LongBridgeSignalStorage &lbss = it->second;
|
|
|
|
|
uint16 offset = signal - 15;
|
|
|
|
|
uint16 offset = signal - BRIDGE_M2_SIGNAL_STATE_COUNT;
|
|
|
|
|
uint16 slot = offset >> 6;
|
|
|
|
|
uint16 bit = offset & 0x3F;
|
|
|
|
|
if (slot >= lbss.signal_red_bits.size()) return SIGNAL_STATE_GREEN;
|
|
|
|
@ -101,32 +101,65 @@ SignalState GetBridgeEntranceSimulatedSignalStateExtended(TileIndex t, uint16 si
|
|
|
|
|
void SetBridgeEntranceSimulatedSignalStateExtended(TileIndex t, uint16 signal, SignalState state)
|
|
|
|
|
{
|
|
|
|
|
LongBridgeSignalStorage &lbss = _long_bridge_signal_sim_map[t];
|
|
|
|
|
uint16 offset = signal - 15;
|
|
|
|
|
uint16 offset = signal - BRIDGE_M2_SIGNAL_STATE_COUNT;
|
|
|
|
|
uint16 slot = offset >> 6;
|
|
|
|
|
uint16 bit = offset & 0x3F;
|
|
|
|
|
if (slot >= lbss.signal_red_bits.size()) lbss.signal_red_bits.resize(slot + 1);
|
|
|
|
|
SB(lbss.signal_red_bits[slot], bit, 1, (uint64) ((state == SIGNAL_STATE_RED) ? 1 : 0));
|
|
|
|
|
_m[t].m2 |= 0x8000;
|
|
|
|
|
_m[t].m2 |= BRIDGE_M2_SIGNAL_STATE_EXT_FLAG;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void SetAllBridgeEntranceSimulatedSignalsGreenExtended(TileIndex t)
|
|
|
|
|
{
|
|
|
|
|
SB(_m[t].m2, BRIDGE_M2_SIGNAL_STATE_OFFSET, BRIDGE_M2_SIGNAL_STATE_FIELD_SIZE, 0);
|
|
|
|
|
auto it = _long_bridge_signal_sim_map.find(t);
|
|
|
|
|
if (it != _long_bridge_signal_sim_map.end()) {
|
|
|
|
|
LongBridgeSignalStorage &lbss = it->second;
|
|
|
|
|
for (auto &it : lbss.signal_red_bits) {
|
|
|
|
|
it = 0;
|
|
|
|
|
}
|
|
|
|
|
_m[t].m2 = 0x8000;
|
|
|
|
|
} else {
|
|
|
|
|
_m[t].m2 = 0;
|
|
|
|
|
_m[t].m2 |= BRIDGE_M2_SIGNAL_STATE_EXT_FLAG;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void ClearBridgeEntranceSimulatedSignalsExtended(TileIndex t)
|
|
|
|
|
{
|
|
|
|
|
_long_bridge_signal_sim_map.erase(t);
|
|
|
|
|
_m[t].m2 = 0;
|
|
|
|
|
SB(_m[t].m2, BRIDGE_M2_SIGNAL_STATE_OFFSET, BRIDGE_M2_SIGNAL_STATE_FIELD_SIZE, 0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void ShiftBridgeEntranceSimulatedSignalsExtended(TileIndex t, int shift, uint64 in)
|
|
|
|
|
{
|
|
|
|
|
if (shift > 0) {
|
|
|
|
|
/* shift into array */
|
|
|
|
|
LongBridgeSignalStorage *lbss = nullptr;
|
|
|
|
|
auto it = _long_bridge_signal_sim_map.find(t);
|
|
|
|
|
if (it != _long_bridge_signal_sim_map.end()) {
|
|
|
|
|
lbss = &(it->second);
|
|
|
|
|
} else if (in) {
|
|
|
|
|
lbss = &(_long_bridge_signal_sim_map[t]);
|
|
|
|
|
} else {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
const size_t orig_size = lbss->signal_red_bits.size();
|
|
|
|
|
size_t i = orig_size;
|
|
|
|
|
auto insert_bits = [&](uint64 bits, size_t pos) {
|
|
|
|
|
if (bits) {
|
|
|
|
|
if (pos >= lbss->signal_red_bits.size()) lbss->signal_red_bits.resize(pos);
|
|
|
|
|
lbss->signal_red_bits[pos] |= bits;
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
while (i) {
|
|
|
|
|
i--;
|
|
|
|
|
uint64 out = GB(lbss->signal_red_bits[i], 64 - shift, shift);
|
|
|
|
|
lbss->signal_red_bits[i] <<= shift;
|
|
|
|
|
insert_bits(out, i + 1);
|
|
|
|
|
}
|
|
|
|
|
insert_bits(in, 0);
|
|
|
|
|
} else if (shift < 0) {
|
|
|
|
|
/* not implemented yet */
|
|
|
|
|
NOT_REACHED();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void ClearBridgeSimulatedSignalMapping()
|
|
|
|
|