mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-21 08:39:45 +00:00
Code Issues Releases Wiki Activity

flags no longer bitfield

Browse source
This commit is contained in:
florent.teppe 2023-01-28 19:47:04 +01:00
parent aa29f86efe
commit 0723c32428
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/openmw/mwworld/cell.cpp
View file

@ -17,9 +17,9 @@ namespace MWWorld
mRegion = ESM::RefId::sEmpty; // Unimplemented for now mRegion = ESM::RefId::sEmpty; // Unimplemented for now
mFlags.hasWater = (cell.mCellFlags & ESM4::CELL_HasWater) != 0; mFlags.hasWater = cell.mCellFlags & ESM4::CELL_HasWater;
mFlags.isExterior = !(cell.mCellFlags & ESM4::CELL_Interior); mFlags.isExterior = !(cell.mCellFlags & ESM4::CELL_Interior);
mFlags.isQuasiExterior = (cell.mCellFlags & ESM4::CELL_QuasiExt) != 0; mFlags.isQuasiExterior = cell.mCellFlags & ESM4::CELL_QuasiExt;
mFlags.noSleep = false; // No such notion in ESM4 mFlags.noSleep = false; // No such notion in ESM4
mCellId.mWorldspace = Misc::StringUtils::lowerCase(cell.mEditorId); mCellId.mWorldspace = Misc::StringUtils::lowerCase(cell.mEditorId);
@ -44,10 +44,10 @@ namespace MWWorld
mRegion = ESM::RefId::sEmpty; // Unimplemented for now mRegion = ESM::RefId::sEmpty; // Unimplemented for now
mFlags.hasWater = (cell.mData.mFlags & ESM::Cell::HasWater) != 0; mFlags.hasWater = cell.mData.mFlags & ESM::Cell::HasWater;
mFlags.isExterior = !(cell.mData.mFlags & ESM::Cell::Interior); mFlags.isExterior = !(cell.mData.mFlags & ESM::Cell::Interior);
mFlags.isQuasiExterior = (cell.mData.mFlags & ESM::Cell::QuasiEx) != 0; mFlags.isQuasiExterior = cell.mData.mFlags & ESM::Cell::QuasiEx;
mFlags.noSleep = (cell.mData.mFlags & ESM::Cell::NoSleep) != 0; mFlags.noSleep = cell.mData.mFlags & ESM::Cell::NoSleep;
mCellId = cell.getCellId(); mCellId = cell.getCellId();

9
apps/openmw/mwworld/cell.hpp
View file

@ -53,11 +53,10 @@ namespace MWWorld
private: private:
struct struct
{ {
uint8_t isExterior : 1; bool isExterior;
uint8_t isQuasiExterior : 1; bool isQuasiExterior;
uint8_t hasWater : 1; bool hasWater;
uint8_t noSleep : 1; bool noSleep;
uint8_t _free : 4;
} mFlags; } mFlags;
osg::Vec2i mGridPos; osg::Vec2i mGridPos;