← Back to branch summary

~openmw/openmw/openmw-packaging2

« back to all changes in this revision

Viewing changes to apps/openmw/mwworld/cellstore.hpp

  • Committer: Scott Howard
  • Date: 2016-09-15 20:56:29 UTC
  • Revision ID: showard@debian.org-20160915205629-3tvfxe47zrb41a91
Cron update. Git hash: 37278b5

Show diffs side-by-side

added added

removed removed

Lines of Context:
apps/openmw/mwworld/cellstore.hpp
258
258
                if (mState != State_Loaded)
259
259
                    return false;
260
260
 
 
261
                if (mMergedRefs.empty())
 
262
                    return true;
 
263
 
261
264
                mHasState = true;
262
265
 
263
266
                for (unsigned int i=0; i<mMergedRefs.size(); ++i)
305
308
                if (mState != State_Loaded)
306
309
                    return false;
307
310
 
 
311
                if (mMergedRefs.empty())
 
312
                    return true;
 
313
 
308
314
                mHasState = true;
309
315
 
310
316
                CellRefList<T>& list = get<T>();
379
385
 
380
386
            void loadRefs();
381
387
 
382
 
            void loadRef (ESM::CellRef& ref, bool deleted);
 
388
            void loadRef (ESM::CellRef& ref, bool deleted, std::map<ESM::RefNum, std::string>& refNumToID);
383
389
            ///< Make case-adjustments to \a ref and insert it into the respective container.
384
390
            ///
385
391
            /// Invalid \a ref objects are silently dropped.