drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 6 Pull Requests Actions Releases 9 Activity

[ox/mc] Fix signed/unsigned comparison in field bitmap

Browse Source
This commit is contained in:
Gary Talent 2020-01-14 20:07:46 -06:00
parent 517551348a
commit c5f0825edb
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deps/ox/src/ox/mc/presenceindicator.cpp vendored
View File

@ -17,7 +17,7 @@ FieldPresenceIndicator::FieldPresenceIndicator(uint8_t *mask, std::size_t maxLen
m_maskLen = maxLen; m_maskLen = maxLen;
} }
ValErr<bool> FieldPresenceIndicator::get(int i) const { ValErr<bool> FieldPresenceIndicator::get(std::size_t i) const {
if (i / 8 < m_maskLen) { if (i / 8 < m_maskLen) {
return (m_mask[i / 8] >> (i % 8)) & 1; return (m_mask[i / 8] >> (i % 8)) & 1;
} else { } else {
@ -25,7 +25,7 @@ ValErr<bool> FieldPresenceIndicator::get(int i) const {
} }
} }
Error FieldPresenceIndicator::set(int i, bool on) { Error FieldPresenceIndicator::set(std::size_t i, bool on) {
if (i / 8 < m_maskLen) { if (i / 8 < m_maskLen) {
if (on) { if (on) {
m_mask[i / 8] |= 1 << (i % 8); m_mask[i / 8] |= 1 << (i % 8);

4
deps/ox/src/ox/mc/presenceindicator.hpp vendored
View File

@ -22,9 +22,9 @@ class FieldPresenceIndicator {
public: public:
FieldPresenceIndicator(uint8_t *mask, std::size_t maxLen); FieldPresenceIndicator(uint8_t *mask, std::size_t maxLen);
ValErr<bool> get(int i) const; ValErr<bool> get(std::size_t i) const;
Error set(int i, bool on); Error set(std::size_t i, bool on);
void setFields(int) noexcept; void setFields(int) noexcept;