Commit Graph

46 Commits (sol2-server-rewrite)

Author SHA1 Message Date
Andrei Kortunov 17222eb821 Get rid of unnecessary find 7 years ago
Andrei Kortunov 1dd36329a3 Load default markers definitions (bug #4410) 7 years ago
Thunderforge dfcd243150 Remove the word "interior" from cell not found message 7 years ago
scrawl a708ac488e
Don't call Store::setUp() unnecessarily
Fixes a threading issue with ESM::Land store caused by calling setUp() while it's being used.
7 years ago
scrawl 29556a1802 More consistent wording of errors/warnings
A Warning indicates a potential problem in the content file(s) that the user told OpenMW to load. E.g. this might cause an object to not display at all or as intended, however the rest of the game will run fine.

An Error, however, is more likely to be a bug with the engine itself - it means that basic assumptions have been violated and the engine might not run correctly anymore.

The above mostly applies to errors/warnings during game-play; startup issues are handled differently: when a file is completely invalid/corrupted to the point that the engine can not start, that might cause messages that are worded as Error due to the severity of the issue but are not necessarily the engine's fault.

Hopefully, being a little more consistent here will alleviate confusion among users as to when a log message should be reported and to whom.
8 years ago
scrawl 25ca89b560 Avoid redundant allocations in Store::search 8 years ago
scrawl a495b9b884 Fix wasteful allocations in Store<Land>::search 8 years ago
scrawl 325bf66653 Return const Land in ESMStore 8 years ago
MiroslavR dafe184220 Fix moved references disappearing when modified by a plugin 9 years ago
MiroslavR d790747389 Implement deletion of moved references (Bug #3471) 9 years ago
scrawl f549b5fb7a Add missing include 9 years ago
scrawl c18de84798 Fix a crash that could occur when two or more plugins move a deleted ref to another cell (Fixes #3446) 9 years ago
scrawl 07b064f616 Rename to lowerCaseInPlace 9 years ago
scrawl 4687c4baad Do not assert() for invalid land data in plugins (Bug #3037)
The resizing of LTEX store to the correct number of plugins was done in the load() method, but the load method won't be called if a plugin contains LAND records but doesn't contain LTEX records. For such plugins the Store<ESM::LandTexture>::search() function would then fail an assertion.
9 years ago
scrawl b8e11cf197 Merge commit 'pull/upstream/678' into HEAD
Conflicts:
	apps/esmtool/record.cpp
	apps/opencs/model/doc/savingstages.cpp
	apps/opencs/model/world/land.cpp
	apps/opencs/model/world/land.hpp
	apps/opencs/model/world/landtexture.cpp
	apps/openmw/mwworld/store.cpp
	components/esm/loadland.cpp
	components/esm/loadland.hpp
9 years ago
Alexander "Ace" Olofsson caa119f13c Fix instantiation on non-Visual Studio 9 years ago
Alexander "Ace" Olofsson 7d4125d97f Fixes for building with unity build 9 years ago
Stanislav Bas d13766cb3c Remove redundant template specializations 10 years ago
Stanislav Bas f15adb4e4f Store::load() overwrites loaded records with the same IDs 10 years ago
scrawl 4f6e5345cc Include cleanup 10 years ago
Stanislav Bas daaff1284e Remove unused includes 10 years ago
Stanislav Bas 67c8f95c4e Load/read methods (for ESM records) accept a deleted flag in OpenMW 10 years ago
Stanislav Bas 5fd48efd28 Some refactoring. Remove unused code 10 years ago
Stanislav Bas c8c79dc1ef Move ID loading into a separate method for Dialogue and DialInfo records 10 years ago
Stanislav Bas c266315a35 Load/read methods in MWWorld::Store return a pair (record ID, deleted flag) 10 years ago
Stanislav Bas 2ed182b144 Update to upstream/master. Resolve merge conflicts in MWWorld::Store 10 years ago
Alexander "Ace" Olofsson 12f413ba9b Don't instantiate specialized templates
This fixes the VS2012 build issue
10 years ago
Stanislav Bas 89e44c8f1f Remove explicit record ID in load/read methods of MWWorld::Store 10 years ago
Alexander "Ace" Olofsson b3b55a5842 Explicitly instantiate MWWorld::Store 10 years ago
scrawl 9d3f0b2ed5 Remove some unused code, include cleanup 10 years ago
scrawl c77660ba20 Remove some nonsense code 10 years ago
scrawl b6c6bfe943 Merge cell names when merging cells (Fixes #1929) 10 years ago
scrawl 6cd6578a88 Handle Deleted moved references (Bug #1613) 11 years ago
scrawl e666ddfe18 Fix list of moved references being discarded (Fixes #1613) 11 years ago
scrawl 68d6b6b2f3 Cell merge fix (reference context position was not saved correctly) 11 years ago
scrawl 73be457805 Merge ESM::Cell fields by subrecord
Fixes an issue with the Morrowind Patched mod where cell ambient values would become black due to the new cell records not including an AMBI subrecord.

Also fixes a bug where mLeasedRefs was incorrectly cleared when overwriting a cell (*oldcell = *cell;)
11 years ago
Marc Zinnschlag 1b5301eec0 Merge branch 'savedgame'
Conflicts:
	apps/openmw/mwbase/mechanicsmanager.hpp
	apps/openmw/mwbase/soundmanager.hpp
	apps/openmw/mwgui/mapwindow.hpp
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
	apps/openmw/mwsound/soundmanagerimp.hpp
	components/esm/loadcell.cpp
11 years ago
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
11 years ago
scrawl 4c0045b418 Bug #1109: Do not reset water level when loading a plugin with no water level record (for real this time) 11 years ago
greye 15d946415e minor cleanup
Removed case folding via std::transform, excessive lowerCase()
replaced with ciEqual().
11 years ago
Marc Zinnschlag 9025210965 Merge branch 'refnum' into savedgame
Conflicts:
	apps/openmw/mwworld/cellstore.cpp
	apps/openmw/mwworld/manualref.hpp
	components/esm/cellref.hpp
11 years ago
Marc Zinnschlag 43dd3b8ef2 removed redundant deletion flag from CellRef 11 years ago
Marc Zinnschlag c22e38f825 removing 255 content file limitation 11 years ago
scrawl 7dc30a01cd Some changes suggested by cppcheck 12 years ago
Glorf 98baf9fac1 Bugfix #718 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