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

Adding of _t to (u)int types, and WChar to char32_t

Browse Source 
See: eaae0bb5e
This commit is contained in:
Jonathan G Rennison
2024-01-07 16:41:53 +00:00
parent 55d78a23be
commit 97e6f3062e
655 changed files with 7555 additions and 7555 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/bridge_map.cpp
View File

@@ -82,14 +82,14 @@ int GetBridgeHeight(TileIndex t)
std::unordered_map<TileIndex, LongBridgeSignalStorage> _long_bridge_signal_sim_map;
SignalState GetBridgeEntranceSimulatedSignalStateExtended(TileIndex t, uint16 signal)
SignalState GetBridgeEntranceSimulatedSignalStateExtended(TileIndex t, uint16_t signal)
{
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 - BRIDGE_M2_SIGNAL_STATE_COUNT;
uint16 slot = offset >> 6;
uint16 bit = offset & 0x3F;
uint16_t offset = signal - BRIDGE_M2_SIGNAL_STATE_COUNT;
uint16_t slot = offset >> 6;
uint16_t bit = offset & 0x3F;
if (slot >= lbss.signal_red_bits.size()) return SIGNAL_STATE_GREEN;
return GB(lbss.signal_red_bits[slot], bit, 1) ? SIGNAL_STATE_RED : SIGNAL_STATE_GREEN;
} else {
@@ -97,14 +97,14 @@ SignalState GetBridgeEntranceSimulatedSignalStateExtended(TileIndex t, uint16 si
}
}
void SetBridgeEntranceSimulatedSignalStateExtended(TileIndex t, uint16 signal, SignalState state)
void SetBridgeEntranceSimulatedSignalStateExtended(TileIndex t, uint16_t signal, SignalState state)
{
LongBridgeSignalStorage &lbss = _long_bridge_signal_sim_map[t];
uint16 offset = signal - BRIDGE_M2_SIGNAL_STATE_COUNT;
uint16 slot = offset >> 6;
uint16 bit = offset & 0x3F;
uint16_t offset = signal - BRIDGE_M2_SIGNAL_STATE_COUNT;
uint16_t slot = offset >> 6;
uint16_t 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));
SB(lbss.signal_red_bits[slot], bit, 1, (uint64_t) ((state == SIGNAL_STATE_RED) ? 1 : 0));
_m[t].m2 |= BRIDGE_M2_SIGNAL_STATE_EXT_FLAG;
}
@@ -132,7 +132,7 @@ void ClearBridgeEntranceSimulatedSignalsExtended(TileIndex t)
SB(_m[t].m2, BRIDGE_M2_SIGNAL_STATE_OFFSET, BRIDGE_M2_SIGNAL_STATE_FIELD_SIZE, 0);
}
void ShiftBridgeEntranceSimulatedSignalsExtended(TileIndex t, int shift, uint64 in)
void ShiftBridgeEntranceSimulatedSignalsExtended(TileIndex t, int shift, uint64_t in)
{
if (shift > 0) {
/* shift into array */
@@ -147,7 +147,7 @@ void ShiftBridgeEntranceSimulatedSignalsExtended(TileIndex t, int shift, uint64
}
const size_t orig_size = lbss->signal_red_bits.size();
size_t i = orig_size;
auto insert_bits = [&](uint64 bits, size_t pos) {
auto insert_bits = [&](uint64_t bits, size_t pos) {
if (bits) {
if (pos >= lbss->signal_red_bits.size()) lbss->signal_red_bits.resize(pos + 1);
lbss->signal_red_bits[pos] |= bits;
@@ -155,7 +155,7 @@ void ShiftBridgeEntranceSimulatedSignalsExtended(TileIndex t, int shift, uint64
};
while (i) {
i--;
uint64 out = GB(lbss->signal_red_bits[i], 64 - shift, shift);
uint64_t out = GB(lbss->signal_red_bits[i], 64 - shift, shift);
lbss->signal_red_bits[i] <<= shift;
insert_bits(out, i + 1);
}
@@ -171,11 +171,11 @@ void ClearBridgeSimulatedSignalMapping()
_long_bridge_signal_sim_map.clear();
}
btree::btree_set<uint32> _bridge_signal_style_map;
btree::btree_set<uint32_t> _bridge_signal_style_map;
static_assert(MAX_MAP_TILES_BITS + 4 <= 32);
static_assert(1 << 4 <= MAX_NEW_SIGNAL_STYLES + 1);
void SetBridgeSignalStyle(TileIndex t, uint8 style)
void SetBridgeSignalStyle(TileIndex t, uint8_t style)
{
if (style == 0) {
/* No style allocated before */
@@ -192,7 +192,7 @@ void SetBridgeSignalStyle(TileIndex t, uint8 style)
}
}
uint8 GetBridgeSignalStyleExtended(TileIndex t)
uint8_t GetBridgeSignalStyleExtended(TileIndex t)
{
auto iter = _bridge_signal_style_map.lower_bound(t << 4);
if (iter != _bridge_signal_style_map.end() && *iter >> 4 == t) return (*iter) & 0xF;