mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-20 07:23:51 +00:00
Code Issues Releases Wiki Activity

Fix warning implicit conversion changes singedness

Browse source
This commit is contained in:
elsid 2018-04-01 16:48:25 +03:00
parent c866fdff86
commit ed89126828
No known key found for this signature in database
GPG key ID: B845CB9FEE18AB40
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -432,7 +432,7 @@ namespace MWWorld
mHasState = true; mHasState = true;
} }
int CellStore::count() const std::size_t CellStore::count() const
{ {
return mMergedRefs.size(); return mMergedRefs.size();
} }

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

@ -240,7 +240,7 @@ namespace MWWorld
ESM::FogState* getFog () const; ESM::FogState* getFog () const;
int count() const; std::size_t count() const;
///< Return total number of references, including deleted ones. ///< Return total number of references, including deleted ones.
void load (); void load ();

5
apps/openmw/mwworld/scene.cpp
View file

@ -379,7 +379,7 @@ namespace MWWorld
unloadCell (active++); unloadCell (active++);
} }
int refsToLoad = 0; std::size_t refsToLoad = 0;
// get the number of refs to load // get the number of refs to load
for (int x=X-mHalfGridSize; x<=X+mHalfGridSize; ++x) for (int x=X-mHalfGridSize; x<=X+mHalfGridSize; ++x)
{ {
@ -553,8 +553,7 @@ namespace MWWorld
while (active!=mActiveCells.end()) while (active!=mActiveCells.end())
unloadCell (active++); unloadCell (active++);
int refsToLoad = cell->count(); loadingListener->setProgressRange(cell->count());
loadingListener->setProgressRange(refsToLoad);
// Load cell. // Load cell.
loadCell (cell, loadingListener, changeEvent); loadCell (cell, loadingListener, changeEvent);