Commit Graph

133 Commits (master)

Author SHA1 Message Date
Marc Zinnschlag fefaec5804 Merge remote-tracking branch 'scrawl/savedgame' into savedgame 11 years ago
Marc Zinnschlag 43dd3b8ef2 removed redundant deletion flag from CellRef 11 years ago
scrawl 5729672262 Show marked position on map. Implement Detect X magic effects. 11 years ago
scrawl a8c838b53a Don't list deleted refs in CellStore::foreach 11 years ago
Marc Zinnschlag e94fcce622 accessing references via their ID now also works for references in containers in active cells 12 years ago
Marc Zinnschlag 62d70f17c8 removed another redundant include 12 years ago
Marc Zinnschlag 5244362fba some cleanup 12 years ago
Marc Zinnschlag e8c32d0c3d MWWorld::Player cleanup 12 years ago
scrawl 918cdcffc2 Split up components/esm/loadlocks 12 years ago
Mark Siewert eefbdde6de - For pull request: remove all instances of maps used to track refnumbers.
- new file: apps/openmw/mwworld/store.cpp, had to move reference merging method out of the header file to prevent three-way recursion/unresolved forward references in custom compare operators.
12 years ago
Mark Siewert 713d324eeb - Minor code cleanup 12 years ago
Mark Siewert d6377fb2e3 - Support deleting references from a plugin
- Add preliminary support for loading some unique fields appearing only in savegames
- Add a few lines required for supporting respawning references. Incomplete.
12 years ago
Mark Siewert 8ccec17481 - Restore ability for plugins deleting records defined in parent files
- Don't throw a runtime_error when trying to load a reference based on a deleted record (just a warning for now, should be closer to MW)
12 years ago
Mark Siewert 896ab44d1e - Add some updated files missing from last commit.
- Move plugin dependency test from esmreader.cpp to esmstpre.cpp; fixes crash in omwlauncher.
12 years ago
Mark Siewert 8ea9f00e6f Merge remote-tracking branch 'upstream/master' into multiple_esm_esp
Conflicts:
	apps/openmw/mwrender/terrain.cpp
	apps/openmw/mwworld/cells.cpp
	apps/openmw/mwworld/cells.hpp
	apps/openmw/mwworld/cellstore.cpp
	apps/openmw/mwworld/cellstore.hpp
	apps/openmw/mwworld/containerstore.cpp
	apps/openmw/mwworld/localscripts.cpp
	apps/openmw/mwworld/scene.cpp
	apps/openmw/mwworld/worldimp.cpp
	apps/openmw/mwworld/worldimp.hpp
	components/esm_store/reclists.hpp
	components/esm_store/store.cpp
	extern/shiny

- Re-implement some patches that were broken by the removal of reclists.hpp and store.cpp/.hpp.
- NOTE: Not everything works as before, I'll have to test some more stuff before we are back to where we were.
12 years ago
Mark Siewert 31fb715bd7 - Add support for moving existing references by plugin files. No cell changing yet.
- Change CellRefList::list from list<> to map<int,> so we can identify live references by their Refnumber.
- Introduce ContainerRefList, a clone of the original CellRefList. It is now used for containers, which do not track Refnumbers.
- Many small tweaks so that the new CellRefList does not conflict with existing code.
12 years ago
Mark Siewert 42eefaf36f - Add support for loading references from multiple esm/esp files. Full reference ID mangling coming soon (currently, moved references are simply cloned).
- Reference loader now (partially) supports MVRF tag.
12 years ago
Mark Siewert 7f77bf76c7 - Add support for multiple esm contexts in cell store. This will allow to generate references from multiple esX files. Currently, only the first context is used.
- Add many TODOs to mark points where more work is required to fully implement this feature.
12 years ago
greye 0fd22ce4b0 CellRefList<X>::find(CellRef &, Y &list) -> ::load(CellRef &, ESMStore &) 12 years ago
greye d205723a17 resolving m prefix/ESMStore movement 12 years ago
greye 2057f5619e move ESMStore to MWWorld 12 years ago
greye 3c2ce25f5f m prefix for mwworld/cellstore.hpp 12 years ago
greye 7606ebafd6 resolving conflicts, minor update 12 years ago
greye b6f7f21bcf fix player cell assertion fail, moveObject(Ptr&, CellStore&, f, f, f) added 13 years ago
greye 79b7487c87 fix using deleted objects 13 years ago
greye e7666d3a7f move responsibility for cell changing from CellStore::insertObject to Class::moveToCell 13 years ago
greye 71253c64ab moving part 2, adding position parameter, stable 13 years ago
greye 61cb012ee7 moving Scene::insertObject to CellStore::insertObject, part 1 13 years ago
greye b760225179 wrong branch
This reverts commit d36d6aacf4.
13 years ago
greye d36d6aacf4 move Scene::insertObject to CellStore::insertObject, part 1 13 years ago
guidoj 0549e949ba Mostly removal of unnecessary #include's and a little clean up 13 years ago
Marc Zinnschlag 7fcd41c69d Issue #107: Detemplateised CellStore; some include cleanup 13 years ago
Marc Zinnschlag 76174098c7 Issue #107: CellStore moved from ESMS to MWWorld 13 years ago