Commit Graph

197 Commits (abd03245d783a3001842d109398e990c9946181d)

Author SHA1 Message Date
greye 9133182f2f restore loading CELL records in esmtool 12 years ago
Marc Zinnschlag dc3edc6024 Merge branch 'vartype' 12 years ago
Marc Zinnschlag 1489570b09 change variant in info record to new type 12 years ago
Marc Zinnschlag 1b19ab6028 fixed gmst integers 12 years ago
Marc Zinnschlag ba4907fbaf use new Variant type for GMSTs 12 years ago
Marc Zinnschlag ce49ad54a1 some cleanup and fixing 12 years ago
Marc Zinnschlag a1ac20c6f3 changed global variable records to new variant type 12 years ago
Marc Zinnschlag 65081f5520 added variant class 12 years ago
Marc Zinnschlag 230136438b minor cleanup 12 years ago
lazydev 60f2219450 fixed zini's norices 12 years ago
lazydev 169a1ff1ce Merge branch 'master' of git://github.com/zinnschlag/openmw 12 years ago
scrawl 6683e43efc Removed commented code 12 years ago
scrawl f75681d89b Ignore ESX header version 12 years ago
Marc Zinnschlag 3bd228f71b fix for global variables of type short 12 years ago
lazydev b93eb84401 fix for https://bugs.openmw.org/issues/573 12 years ago
lazydev 759b2e96bf fix for https://bugs.openmw.org/issues/577 12 years ago
Marc Zinnschlag a7102c143f ESX variable type cleanup 12 years ago
Chris Robinson db9a3aeddf Merge remote-tracking branch 'zini/master' into animation2 12 years ago
Nathan Jeffords 44b1c66c4b fixed various warnings about converting size_t to int 12 years ago
Chris Robinson e2d7cc49e3 Merge remote-tracking branch 'zini/next' into animation2 12 years ago
Douglas Mencken df5919f2c5 Use `signed char' explicitly where needed. It is important because:
- It is implementation-dependent if plain `char' signed or not.
- C standard defines three *distinct* types: char, signed char,
  and unsigned char.
- Assuming that char is always unsigned or signed can lead to
  compile-time and run-time errors.

You can also use int8_t, but then it would be less obvious for developers
to never assume that char is always unsigned (or always signed).

Conflicts:

	components/esm/loadcell.hpp
12 years ago
Chris Robinson f197c67e95 Fix a circular include 12 years ago
Marc Zinnschlag f19fbaa293 Merge remote-tracking branch 'mark76/multiple_esm_esp' into next 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
Marc Zinnschlag d5dd0640c7 basic gmst support 12 years ago
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.
12 years ago
Mark Siewert 713d324eeb - Minor code cleanup 12 years ago
Mark Siewert a8e02779b2 - Add support for multiple plugins trying to modify the same reference
- Fix a small signed/unsigned warning
12 years ago
Marc Zinnschlag 25815ab8f7 Merge remote-tracking branch 'potatoesmaster/to_utf8-rewrite' 12 years ago
Emanuel Guevel 63f09462fd to_utf8, Utf8Encoder: pass encoding as constructor parameter
Edit other files accordingly.
12 years ago
Nathan Jeffords fec9a59237 changed EMSLoader to use ConstrainedDataStream
Changed the EMSLoader class to use the ConstrainedDataStream so that
future changes may benifit from its increased performance.
12 years ago
Emanuel Guevel 02bf02f288 ESMReader, ESMWriter: use Utf8Encoder 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
Marc Zinnschlag 334588bf1c Merge branch 'editor2' 12 years ago
Mark Siewert 049b0e66e0 - Restore ability to generate references in the same cell from multiple plugins
- Disable some code related to deleting entries in the store so that it builds again
12 years ago
lazydev 74ae479780 Cell names localization fix 12 years ago
Thoronador 5a7a8629b6 remove unnecessary include directive 12 years ago
Thoronador 32f051d61d Remove 'GMST fixing' for dirty GMST records
The 'fixing' for so-called dirty GMSTs does not work properly in its
current state anyway, so it should be removed. Fixing the 'GMST fixing'
might not be possible, because whether or not a GMST is 'dirty' depends
on the language version of MW. Therefore different 'fixing' algorithms
would be required for the different MW localisations, and I do not see
a good reason why GMST values should be hard-coded in the GMST load
procedure. In my opinion, it only clutters the code.

Last but not least, I believe that it is not the task of the engine to
clean ESM files from dirty entries. That is a job for the modders, who
should only release clean ESM/ESP files in the first place. The engine
should not need to worry about whether a file is 'dirty' or not.

That is why I believe a feature for cleaning ESM/ESP files shall not be
part of the engine.
12 years ago
Marc Zinnschlag 5cd2fe00ab initialise blank global records 12 years ago
Marc Zinnschlag 8a09e03d5c global variable editing (no undo support yet) 12 years ago
Marc Zinnschlag ef9575498f basic (non-editable) subview for global variables 12 years ago
Mark Siewert b103426cf0 - Partially reimplement deleting objects defined in a parent esX file.
- Try to reimplement multiple esX files dropping references in the same file.
NOTE: None of these features works. Maybe the code itself does not build. Anyway, after 12 hours of hacking, I am just tired and want to get a snapshot of the code out.
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 2175f13b67 - Add tracking for dependencies between plugins.
- Add reference number mangling required for moving references around.
12 years ago
scrawl 5f7d349126 several missing includes 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
Marc Zinnschlag 75f64aa38b Merge branch 'master' into dialogue
Conflicts:
	apps/openmw/mwdialogue/dialoguemanagerimp.hpp
	apps/openmw/mwmechanics/npcstats.cpp
	apps/openmw/mwmechanics/npcstats.hpp
12 years ago
greye b1ef0026a9 race selection/inventory preview character model update 12 years ago