Fix object definitions stuck on Level 2.5 only

This commit is contained in:
G.K.MacGregor
2021-11-10 09:16:24 +00:00
parent dab124cf80
commit fa29f25c91

View File

@@ -53,7 +53,7 @@ void X26Triplet::setAddressColumn(int addressColumn)
void X26Triplet::setObjectLocalDesignationCode(int i) void X26Triplet::setObjectLocalDesignationCode(int i)
{ {
m_address = 0x28 | (i >> 3); m_address = (m_address & 0x38) | (i >> 3);
m_data = (m_data & 0x0f) | ((i & 0x07) << 4); m_data = (m_data & 0x0f) | ((i & 0x07) << 4);
} }
@@ -64,7 +64,7 @@ void X26Triplet::setObjectLocalTripletNumber(int i)
void X26Triplet::setObjectLocalIndex(int i) void X26Triplet::setObjectLocalIndex(int i)
{ {
m_address = 0x28 + (i >= 104); // Set bit 0 of address if triplet >= 8 m_address = (m_address & 0x38) + (i >= 104); // Set bit 0 of address if triplet >= 8
m_data = (((i / 13) & 0x07) << 4) | (i % 13); m_data = (((i / 13) & 0x07) << 4) | (i % 13);
} }