Marc Zinnschlag
29c3a288e3
load and save of reference in cells (without CustomData state)
2014-01-27 13:27:42 +01:00
scrawl
03cf383be7
Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame
...
Conflicts:
apps/openmw/mwgui/referenceinterface.cpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
apps/openmw/mwscript/cellextensions.cpp
apps/openmw/mwworld/cells.cpp
apps/openmw/mwworld/cells.hpp
apps/openmw/mwworld/cellstore.cpp
apps/openmw/mwworld/store.cpp
apps/openmw/mwworld/worldimp.cpp
2014-01-24 18:28:35 +01:00
Marc Zinnschlag
419e3a7d30
write references in cells to saved game file
2014-01-23 12:51:42 +01:00
Marc Zinnschlag
22cb4784b5
store cell state in saved game files (no references yet)
2014-01-23 11:29:40 +01:00
greye
15d946415e
minor cleanup
...
Removed case folding via std::transform, excessive lowerCase()
replaced with ciEqual().
2014-01-14 12:46:53 +04:00
scrawl
bf6d302fba
Confiscate stolen items when caught
2014-01-11 03:29:41 +01:00
scrawl
03b6334ceb
Get rid of a hack
2014-01-07 20:43:08 +01:00
scrawl
62774fcc4a
Merge branch 'master' into HEAD
...
Conflicts:
apps/openmw/mwbase/world.hpp
apps/openmw/mwinput/inputmanagerimp.cpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwworld/worldimp.cpp
apps/openmw/mwworld/worldimp.hpp
components/esm/loadtes3.cpp
2014-01-06 00:23:17 +01:00
scrawl
ea3b88951a
Implement divine/almsivi intervention magic effects
2014-01-01 02:22:11 +01:00
Marc Zinnschlag
e818d43bc3
removed an outdated typedef and some dead code
2013-12-05 13:21:26 +01:00
Marc Zinnschlag
e94fcce622
accessing references via their ID now also works for references in containers in active cells
2013-08-15 14:45:13 +02:00
scrawl
45006ea193
Fix inventory/container content loading so that it's done for dynamically spawned objects as well
2013-07-31 00:02:24 +02:00
scrawl
aaa9aba999
Some fixes
2013-05-15 22:38:53 +02:00
scrawl
c41f119ba6
Added new game button
2013-05-15 17:54:18 +02:00
scrawl
1acfd849a2
Fix a case folding bug
2013-05-01 16:38:16 +02:00
scrawl
48f46e505c
Look in exterior cells first (chargen_crate_01_empty is in the prison ship but also outside of it, the one outside needs to be disabled)
2013-04-14 17:37:39 +02:00
scrawl
9e08497f02
Initial container content should inherit the owner of its container
2013-04-07 22:07:04 +02:00
scrawl
918cdcffc2
Split up components/esm/loadlocks
2013-03-22 05:50:54 +01:00
Michal Sciubidlo
f2f4b6e2d5
Make MWWorld::getInterior case insensitive.
...
Interior cells names can use different mix of uppercase/lowercase in different places.
getInterior() should return same cell in all cases. Fixes bug #586 .
2013-03-07 20:15:01 +01:00
Chris Robinson
5d5d28c06c
Increase the ID cache to 40
...
Helps improve performance with Tribunal and Bloodmoon's scripts
2013-02-25 07:43:56 -08:00
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.
2013-02-09 13:00:57 +01:00
Mark Siewert
dca8dc4fdb
Merge remote-tracking branch 'upstream/master' into multiple_esm_esp
...
Conflicts:
apps/openmw/engine.cpp
apps/openmw/mwworld/cellstore.cpp
apps/openmw/mwworld/store.hpp
apps/openmw/mwworld/worldimp.cpp
apps/openmw/mwworld/worldimp.hpp
components/esm/esmreader.hpp
- Quick hack: OMW::Engine::prepareEngine only loads translation data for the first master file.
2013-01-25 18:22:01 +01:00
eduard
2dc0064cc2
more string lowercase
2013-01-09 20:51:52 +01:00
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.
2012-11-25 14:12:44 +01:00
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.
2012-11-17 21:50:25 +01:00
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.
2012-11-10 21:43:41 +01:00
greye
242a9b5a59
various interface fixes, commented unused code
2012-11-06 14:03:36 +04:00
greye
ff8da265ed
applying new interface vol.9, inconsistent
2012-11-06 12:36:21 +04:00
greye
d205723a17
resolving m prefix/ESMStore movement
2012-11-05 18:02:47 +04:00
greye
2057f5619e
move ESMStore to MWWorld
2012-11-05 17:18:01 +04:00
greye
3c2ce25f5f
m prefix for mwworld/cellstore.hpp
2012-11-05 16:07:59 +04:00
greye
7606ebafd6
resolving conflicts, minor update
2012-09-17 11:37:50 +04:00
greye
d32a61b928
fix object moving
2012-08-06 18:20:48 +04:00
guidoj
0549e949ba
Mostly removal of unnecessary #include's and a little clean up
2012-07-17 09:27:12 +02:00
Alexander "Ace" Olofsson
113457d934
Fixed some windows issues and got rid of a few tiny warnings while at it.
2012-07-07 01:14:18 +02:00
Marc Zinnschlag
5a7b95bf7a
Issue #107 : cleaned up includes in apps/openmw/mwworld/class.hpp
2012-07-03 13:15:20 +02:00
Marc Zinnschlag
4c39fefd1e
Issue #107 : World is accessed only through the interface class from now on; some include cleanup
2012-07-03 12:30:50 +02:00
Marc Zinnschlag
7fcd41c69d
Issue #107 : Detemplateised CellStore; some include cleanup
2012-06-29 18:54:23 +02:00
Marc Zinnschlag
76174098c7
Issue #107 : CellStore moved from ESMS to MWWorld
2012-06-29 16:48:50 +02:00
Marc Zinnschlag
89ac0fa232
Issue #312 : Implemented ID-search caching to speed up some badly written scripts
2012-06-21 11:43:18 +02:00
Marc Zinnschlag
590dfe8d63
fixed the container fill problem on cell load
2012-06-19 16:42:10 +02:00
Marc Zinnschlag
6fe53aa320
Issue #277 : containers in cells were not filled up on cell load when the cell was preloaded before
2012-05-25 17:55:00 +02:00
Marc Zinnschlag
5562653578
provisionally fill up containers on cell load
2012-03-10 12:36:29 +01:00
Marc Zinnschlag
a0ac6e5150
cells were sometimes not fully loaded
2012-02-12 12:35:29 +01:00
Marc Zinnschlag
b866323cf3
Issue #31 : create new exterior cells on the fly
2011-09-27 10:08:07 +02:00
Marc Zinnschlag
02ce672fdc
preload cell's reference list when accessing a reference outside of the actice cells (memory usage and speed optimisation)
2011-09-24 11:45:59 +02:00
Marc Zinnschlag
af4f48fd3f
Issue #28 : implemented access to references outside of the active cells
2011-09-22 12:44:17 +02:00
Marc Zinnschlag
aa87370d8f
Issue #28 : moved cell-specific getPtr function from World to Cells
2011-09-22 11:59:39 +02:00
Marc Zinnschlag
ce7202a147
Issue #28 : shifting around functionality among CellStore, Cells and CellList
2011-09-10 11:23:30 +02:00
Marc Zinnschlag
e8632a799d
Feature #28 : refactored out cell management into a separate class
2011-09-08 11:02:55 +02:00
