Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-05-04 07:47:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 34

Merge remote-tracking branch 'upstream/master' into wizardhead

Browse source
This commit is contained in:
pvdk 2014-02-24 13:58:51 +01:00
commit fb59112b74
101 changed files with 1632 additions and 685 deletions
Download patch file Download diff file Expand all files Collapse all files

13
components/esm/cellid.cpp
View file

@ -23,4 +23,15 @@ void ESM::CellId::save (ESMWriter &esm) const
if (mPaged)
esm.writeHNT ("CIDX", mIndex, 8);
}
}
bool ESM::operator== (const CellId& left, const CellId& right)
{
return left.mWorldspace==right.mWorldspace && left.mPaged==right.mPaged &&
(!left.mPaged || (left.mIndex.mX==right.mIndex.mX && left.mIndex.mY==right.mIndex.mY));
}
bool ESM::operator!= (const CellId& left, const CellId& right)
{
return !(left==right);
}

3
components/esm/cellid.hpp
View file

@ -23,6 +23,9 @@ namespace ESM
void load (ESMReader &esm);
void save (ESMWriter &esm) const;
};
bool operator== (const CellId& left, const CellId& right);
bool operator!= (const CellId& left, const CellId& right);
}
#endif