mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-28 11:39:40 +00:00
Code Issues Releases Wiki Activity

Remove redundant formatting changes

Browse source
This commit is contained in:
Andrei Kortunov 2021-01-12 12:39:19 +04:00
parent b975f16e6b
commit f40e227686
7 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/engine.cpp
View file

@ -725,7 +725,7 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
}
// Create the world
mEnvironment.setWorld(new MWWorld::World (mViewer, rootNode, mResourceSystem.get(), mWorkQueue.get(),
mEnvironment.setWorld( new MWWorld::World (mViewer, rootNode, mResourceSystem.get(), mWorkQueue.get(),
mFileCollections, mContentFiles, mGroundcoverFiles, mEncoder, mActivationDistanceOverride, mCellName,
mStartupScript, mResDir.string(), mCfgMgr.getUserDataPath().string()));
mEnvironment.getWorld()->setupPlayer();

1
apps/openmw/mwrender/objectpaging.cpp
View file

@ -373,6 +373,7 @@ namespace MWRender
std::map<ESM::RefNum, ESM::CellRef> refs;
std::vector<ESM::ESMReader> esm;
const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
for (int cellX = startCell.x(); cellX < startCell.x() + size; ++cellX)
{
for (int cellY = startCell.y(); cellY < startCell.y() + size; ++cellY)

1
apps/openmw/mwrender/renderingmanager.cpp
View file

@ -73,6 +73,7 @@
namespace MWRender
{
class StateUpdater : public SceneUtil::StateSetUpdater
{
public:

2
apps/openmw/mwworld/cellreflist.hpp
View file

@ -24,8 +24,6 @@ namespace MWWorld
/// all methods are known.
void load (ESM::CellRef &ref, bool deleted, const MWWorld::ESMStore &esmStore);
inline bool ignoreInstance (const X* ptr);
LiveRef &insert (const LiveRef &item)
{
mList.push_back(item);

1
apps/openmw/mwworld/cellstore.cpp
View file

@ -169,6 +169,7 @@ namespace
namespace MWWorld
{
template <typename X>
void CellRefList<X>::load(ESM::CellRef &ref, bool deleted, const MWWorld::ESMStore &esmStore)
{

16
apps/openmw/mwworld/esmloader.cpp
View file

@ -17,15 +17,15 @@ EsmLoader::EsmLoader(MWWorld::ESMStore& store, std::vector<ESM::ESMReader>& read
void EsmLoader::load(const boost::filesystem::path& filepath, int& index)
{
ContentLoader::load(filepath.filename(), index);
ContentLoader::load(filepath.filename(), index);
ESM::ESMReader lEsm;
lEsm.setEncoder(mEncoder);
lEsm.setIndex(index);
lEsm.setGlobalReaderList(&mEsm);
lEsm.open(filepath.string());
mEsm[index] = lEsm;
mStore.load(mEsm[index], &mListener);
ESM::ESMReader lEsm;
lEsm.setEncoder(mEncoder);
lEsm.setIndex(index);
lEsm.setGlobalReaderList(&mEsm);
lEsm.open(filepath.string());
mEsm[index] = lEsm;
mStore.load(mEsm[index], &mListener);
}
} /* namespace MWWorld */

1
components/esm/esmreader.hpp
View file

@ -289,6 +289,7 @@ private:
ToUTF8::Utf8Encoder* mEncoder;
size_t mFileSize;
};
}
#endif