mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-03-09 22:13:31 +00:00
fixes tests
fix linux build + clang-tidy
This commit is contained in:
parent
1d03b54694
commit
43e247d458
@ -1271,7 +1271,7 @@ namespace MWWorld
|
||||
CellStore* newCell
|
||||
= cell->isExterior() ? &mWorldModel.getExterior(index.x(), index.y(), worldspaceId) : nullptr;
|
||||
bool isCellActive = getPlayerPtr().isInCell() && getPlayerPtr().getCell()->isExterior()
|
||||
&& mWorldScene->isCellActive(*newCell);
|
||||
&& (newCell && mWorldScene->isCellActive(*newCell));
|
||||
|
||||
if (cell->isExterior() || (moveToActive && isCellActive && ptr.getClass().isActor()))
|
||||
cell = newCell;
|
||||
|
@ -8,6 +8,7 @@
|
||||
#include <components/esm3/esmreader.hpp>
|
||||
#include <components/esm3/esmwriter.hpp>
|
||||
#include <components/esm3/loadregn.hpp>
|
||||
#include <components/esm4/loadwrld.hpp>
|
||||
#include <components/loadinglistener/loadinglistener.hpp>
|
||||
#include <components/settings/settings.hpp>
|
||||
|
||||
|
@ -20,6 +20,7 @@
|
||||
#include <components/esm4/loadligh.hpp>
|
||||
#include <components/esm4/loadrefr.hpp>
|
||||
#include <components/esm4/loadstat.hpp>
|
||||
#include <components/esm4/loadwrld.hpp>
|
||||
#include <components/esm4/reader.hpp>
|
||||
#include <components/esm4/readerutils.hpp>
|
||||
#include <components/files/configurationmanager.hpp>
|
||||
|
Loading…
x
Reference in New Issue
Block a user