1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-30 19:45:38 +00:00
Commit graph

2306 commits

Author SHA1 Message Date
cc9cii
60d5ea7ab6 Fix bug where new addons could not be created since commit ff072441fd. 2015-12-19 20:57:29 +11:00
cc9cii
90b76801f6 Reduce the call to tolower() for each character when the string is already in lower case.
- only a minor performance gain according to the MSVC profiler
2015-12-19 18:50:07 +11:00
cc9cii
003b0d48be Move resource names listing code out of CSMWorld::Resources ctor in order to avoid multiple scan of the same resources.
- The resources are still scanned twice, once when the archive/directory is added and another time when the names are listed.
2015-12-19 17:39:02 +11:00
cc9cii
06f9922822 Performance improvements for loading Info records.
- The order of info records with the same topic are maintained in Collection::mRecords
- The index lookup data structure are not ordered.  The topic string is hashed.  The infos for the topic are simply placed in a vector.
- The index values for appending or inserting a record takes prev/next values (if exist)
- FIXME: prev/next values are not adjusted for adding or removing records
- FIXME: undo after reordering does not reset the modified flag
2015-12-19 17:30:55 +11:00
cc9cii
edf4e6ff95 Fix crash when repeatedly performing delete/undo due to empty moved record.
- introduced in commit 23e7e3c165
2015-12-19 17:22:09 +11:00
cc9cii
76e9a03596 More efficient implementation of an earlier fix so that id is searched only once
- see commit 306bfcbdf2
2015-12-18 19:41:19 +11:00
cc9cii
477e0ee912 Convert std::to_string() calls to snprintf() for cell references.
- Profiling indicates snprintf() is more efficient when using MSVC (not tested with linux)
2015-12-18 19:39:40 +11:00
cc9cii
f6d6138f46 Minor formatting change. 2015-12-11 22:39:03 +11:00
cc9cii
de5ce7059e Use load message system for moved ref target cell error logging. 2015-12-11 22:20:21 +11:00
cc9cii
47b5fa9dae Convert some of ostringstream << operations to std::to_sting() calls.
- At least with MSVC the latter is more efficient.
- There are many more, but leave them until they show up during profiling (so far only loading was profiled, and mainly cell references)
2015-12-11 22:18:17 +11:00
cc9cii
86945d1912 Convert the CellRef record index lookup maps to use integer keys rather than strings.
- Morrowind load over 300,000 references, so even small inefficiencies add up to longer loading times.
- std::map is used, but should try others, std::unordered_map or even std::vector
2015-12-11 21:00:13 +11:00
cc9cii
0de223c637 Fix bug (#3067) where content file number was being ignored while searching for already loaded cell references.
- Introduced by commits 49884f54f7 and 896ab44d1e.
- Also see https://github.com/OpenMW/openmw/pull/557
2015-12-11 07:18:54 +11:00
cc9cii
306bfcbdf2 Fix exception when deleting a record while dialogue subview for that record is open. 2015-12-08 00:27:20 +11:00
cc9cii
68e16b6cee Convert RefNum index map to use find(). 2015-12-06 21:19:06 +11:00
cc9cii
a967418a5a Fix Preview and Unpaged World subviews not rendering. Not sure if this is related to a later version of Ogre being used. 2015-12-06 19:50:26 +11:00
cc9cii
ff072441fd Change the loader's top progress bar to show total number of records processed rather than the number of files. 2015-12-06 19:48:56 +11:00
cc9cii
19af94b73e Reduce copying further by adding move constructors and move assignment operators to CellRef structs. 2015-12-06 15:20:45 +11:00
cc9cii
23e7e3c165 Use std::unique_ptr to store records in collections, RefidCollection and RefIdData.
- std::move support required (C++11)
- MSVC 2013 or later should be fine
2015-12-06 15:14:05 +11:00
cc9cii
257126ed69 Call push_back() if inserting to the end of the vector. It seems MSVC may be generating different code compared to insert(). 2015-12-05 20:50:47 +11:00
cc9cii
77394fce99 Fix table being sorted twice (at least it appeared that way according to the sample profiler)
- Quoting Qt-4.8: "Note: . Setting the property to true with setSortingEnabled() immediately triggers a call to sortByColumn() with the current sort section and order."
2015-12-05 20:38:09 +11:00
cc9cii
f029682057 Merge branch 'cc9cii' into minor-enhancements
Conflicts:
	apps/opencs/model/doc/savingstages.cpp
	apps/opencs/model/world/refidcollection.cpp
2015-12-05 19:55:32 +11:00
scrawl
3c02703876 Not found Land Textures are no longer a fatal error (Bug #3037)
Log warning message and show the default texture when encountering invalid ESM::LandTexture references.

(cherry picked from commit 35fa1f5865)
2015-12-05 18:14:55 +11:00
Marc Zinnschlag
ec00bd2c98 make initial size of script error panel configurable (Fixes #2996)
(cherry picked from commit 99500f4021)
2015-12-05 17:45:58 +11:00
Marc Zinnschlag
8c4d414635 remember script error panel height per scriptsubview
(cherry picked from commit f5c61ee616)
2015-12-05 17:45:45 +11:00
Marc Zinnschlag
8da783d877 do not adjust error panel height if panal was already open
(cherry picked from commit 26640d17eb)
2015-12-05 17:45:32 +11:00
Marc Zinnschlag
2c5f0bf6c5 hide script error list when there are no errors (Fixes #2867)
(cherry picked from commit 1093a53cf9)
2015-12-05 17:45:16 +11:00
Marc Zinnschlag
0366a05649 Removed validator for filenames in OpenMW-CS (Fixes #2918)
(cherry picked from commit b74b274ac0)
2015-12-05 17:44:59 +11:00
Marc Zinnschlag
30b28bfd07 adjusted startup warning message for recent improvements regarding loading/saving
(cherry picked from commit e0e9e7f8c2)
2015-12-05 17:44:40 +11:00
scrawl
ebf9ffd1da Fix double writing of Dialogue NAME in OpenCS
(cherry picked from commit af4923577b)
2015-12-05 17:33:13 +11:00
cc9cii
1334091613 Resolve merge issues. 2015-12-05 17:28:32 +11:00
Stanislav Bas
2abdeef2e0 Remove unused includes
(cherry picked from commit daaff1284e)

Conflicts:
	apps/openmw/mwworld/store.cpp
	components/esm/util.hpp
2015-12-05 11:23:57 +11:00
Stanislav Bas
f4587e48f3 Load methods (for ESM records) accept a deleted flag in OpenCS
(cherry picked from commit 13bb6be238)

Conflicts:
	apps/opencs/model/doc/savingstages.cpp
	apps/opencs/model/world/land.cpp
	apps/opencs/model/world/land.hpp
	apps/opencs/model/world/landtexture.cpp
2015-12-05 11:22:51 +11:00
Stanislav Bas
7013ba751c Fix build errors & warnings
(cherry picked from commit 1e8182220a)
2015-12-05 11:19:22 +11:00
Stanislav Bas
0277a4e8c4 Implement saving of deleted records
(cherry picked from commit 8e6a7be6f5)

Conflicts:
	apps/opencs/model/doc/savingstages.cpp
2015-12-05 11:18:15 +11:00
Stanislav Bas
a120bb2b54 Delete infos of deleted dialogue when loading a content file
(cherry picked from commit e04e32bcff)
2015-12-05 09:46:53 +11:00
Stanislav Bas
9a803739ff Add a separate method to check whether a record is deleted or not for IdCollection
(cherry picked from commit a4d3e59e5c)
2015-12-05 09:46:40 +11:00
Stanislav Bas
4e199697cc Handle deleted records in RefCollection
(cherry picked from commit 3ba73f5fd9)
2015-12-05 07:20:22 +11:00
Stanislav Bas
9503104129 Return a correct index for a loaded record that was deleted
(cherry picked from commit a1389b87ba)
2015-12-05 07:19:55 +11:00
Stanislav Bas
0979d88b0c Rework RefIdData code. Update the index map when a new record is loaded
(cherry picked from commit 5e623a2a1d)
2015-12-05 07:19:43 +11:00
Stanislav Bas
bd695feded Remove INAM handling from InfoCollection
(cherry picked from commit 71e5fc7f04)
2015-12-05 07:19:18 +11:00
Stanislav Bas
d518d70212 Remove NAME and DELE handling from IdCollection
(cherry picked from commit 74a055f3cc)
2015-12-05 07:18:39 +11:00
Stanislav Bas
639e6e1c56 Remove DELE and NAME handling from RefIdCollection and RefIdData
(cherry picked from commit 42f9136141)
2015-12-05 07:18:27 +11:00
cc9cii
19eed6f4c4 Fix warning C4458 (declaration of 'data' hides class member) 2015-11-22 19:23:11 +11:00
cc9cii
4290751010 Fix warning C4457 (declaration hides function parameter) 2015-11-22 19:17:10 +11:00
cc9cii
d70064efe4 Fix warning C4456 (declaration hides previous local declaration) 2015-11-22 19:15:06 +11:00
cc9cii
cc984497d7 Fix warning C4838 (conversion from 'double' to 'const float' requires a narrowing conversion) 2015-11-22 18:49:58 +11:00
cc9cii
f68e423c33 Add missing Ogre headers. 2015-11-22 18:43:44 +11:00
cc9cii
a38881e4cf Further clean up of moving out NpcAutoCalc from Data. 2015-11-08 09:45:12 +11:00
cc9cii
04c5c0d82a Move NPC autocal code out to a separate class. 2015-11-08 06:02:53 +11:00
cc9cii
9716b671f1 Merge branch 'cc9cii' into Feature-1278
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/world/nestedcoladapterimp.cpp
	apps/opencs/view/render/cell.cpp
	apps/opencs/view/render/worldspacewidget.cpp
2015-11-07 12:04:09 +11:00