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

[ox/mc] Fix FieldPresenceIndicator to return correct value when overflow occurs

Browse Source
This commit is contained in:
Gary Talent 2019-07-29 22:55:17 -05:00
parent 142387aa04
commit ff4adaebf1
2 changed files with 3 additions and 3 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,11 +17,11 @@ FieldPresenceIndicator::FieldPresenceIndicator(uint8_t *mask, std::size_t maxLen
m_maskLen = maxLen; m_maskLen = maxLen;
} }
bool FieldPresenceIndicator::get(int i) const { ValErr<bool> FieldPresenceIndicator::get(int 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 {
return MC_PRESENCEMASKOUTBOUNDS; return {false, OxError(MC_PRESENCEMASKOUTBOUNDS)};
} }
} }

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

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