1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-16 16:59:56 +00:00
Commit graph

147 commits

Author SHA1 Message Date
tri4ng1e
f2613a74b1
Write settings before invoking openmw-iniimporter 2018-05-17 21:20:04 +03:00
tri4ng1e
d4d1703bcf
Some PVS-Studio and cppcheck fixes
cppcheck:
[apps/esmtool/record.cpp:697]: (performance) Prefer prefix ++/-- operators for non-primitive types.
[apps/esmtool/record.cpp:1126]: (performance) Prefer prefix ++/-- operators for non-primitive types.
[apps/esmtool/record.cpp:1138]: (performance) Prefer prefix ++/-- operators for non-primitive types.
[apps/niftest/niftest.cpp:36]: (performance) Function parameter 'filename' should be passed by reference.
[apps/niftest/niftest.cpp:41]: (performance) Function parameter 'filename' should be passed by reference.
[apps/opencs/model/prefs/boolsetting.cpp:25]: (warning) Possible leak in public function. The pointer 'mWidget' is not deallocated before it is allocated.
[apps/opencs/model/prefs/shortcuteventhandler.cpp:52]: (warning) Return value of std::remove() ignored. Elements remain in container.
[apps/openmw/mwstate/quicksavemanager.cpp:5]: (performance) Variable 'mSaveName' is assigned in constructor body. Consider performing initialization in initialization list.

PVS-Studio:
apps/opencs/model/filter/parser.cpp  582  warn  V560 A part of conditional expression is always true: allowPredefined.
apps/opencs/view/world/referencecreator.cpp  67  warn  V547 Expression '!errors.empty()' is always false.
apps/opencs/view/world/referencecreator.cpp  74  warn  V547 Expression '!errors.empty()' is always false.
apps/opencs/view/doc/loader.cpp  170  warn  V560 A part of conditional expression is always true: !completed.
apps/opencs/view/doc/loader.cpp  170  warn  V560 A part of conditional expression is always true: !error.empty().
apps/opencs/model/tools/pathgridcheck.cpp  32  err  V517 The use of 'if (A) {...} else if (A) {...}' pattern was detected. There is a probability of logical error presence. Check lines: 32, 34.
apps/opencs/model/world/refidadapterimp.cpp  1376  err  V547 Expression 'subColIndex < 3' is always true.

apps/openmw/mwgui/widgets.hpp  318  warn  V703 It is odd that the 'mEnableRepeat' field in derived class 'MWScrollBar' overwrites field in base class 'ScrollBar'. Check lines: widgets.hpp:318, MyGUI_ScrollBar.h:179.
apps/openmw/mwgui/widgets.hpp  319  warn  V703 It is odd that the 'mRepeatTriggerTime' field in derived class 'MWScrollBar' overwrites field in base class 'ScrollBar'. Check lines: widgets.hpp:319, MyGUI_ScrollBar.h:180.
apps/openmw/mwgui/widgets.hpp  320  warn  V703 It is odd that the 'mRepeatStepTime' field in derived class 'MWScrollBar' overwrites field in base class 'ScrollBar'. Check lines: widgets.hpp:320, MyGUI_ScrollBar.h:181
apps/openmw/mwmechanics/actors.cpp  1425  warn  V547 Expression '!detected' is always true.
apps/openmw/mwmechanics/character.cpp  2155  err  V547 Expression 'mode == 0' is always true.
apps/openmw/mwmechanics/character.cpp  1192  warn  V592 The expression was enclosed by parentheses twice: ((expression)). One pair of parentheses is unnecessary or misprint is present.
apps/openmw/mwmechanics/character.cpp  521  warn  V560 A part of conditional expression is always true: (idle == mIdleState).
apps/openmw/mwmechanics/pathfinding.cpp  317  err  V547 Expression 'mPath.size() >= 2' is always true.
apps/openmw/mwscript/interpretercontext.cpp  409  warn  V560 A part of conditional expression is always false: rank > 9.
apps/openmw/mwgui/windowbase.cpp  28  warn  V560 A part of conditional expression is always true: !visible.
apps/openmw/mwgui/journalwindow.cpp  561  warn  V547 Expression '!mAllQuests' is always false.
apps/openmw/mwgui/referenceinterface.cpp  18  warn  V571 Recurring check. The '!mPtr.isEmpty()' condition was already verified in line 16.
apps/openmw/mwworld/scene.cpp  463  warn  V547 Expression 'adjustPlayerPos' is always true.
apps/openmw/mwworld/worldimp.cpp  409  err  V766 An item with the same key '"sCompanionShare"' has already been added.
apps/openmw/mwworld/cellstore.cpp  691  warn  V519 The 'state.mWaterLevel' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 689, 691.
apps/openmw/mwworld/weather.cpp  1125  warn  V519 The 'mResult.mParticleEffect' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 1123, 1125.
apps/openmw/mwworld/weather.cpp  1137  warn  V519 The 'mResult.mParticleEffect' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 1135, 1137.

apps/wizard/unshield/unshieldworker.cpp  475  warn  V728 An excessive check can be simplified. The '(A && B) || (!A && !B)' expression is equivalent to the 'bool(A) == bool(B)' expression.
apps/wizard/installationpage.cpp  163  warn  V735 Possibly an incorrect HTML. The "</p" closing tag was encountered, while the "</span" tag was expected.

components/fontloader/fontloader.cpp  427  err  V547 Expression 'i == 1' is always true.
components/nifosg/nifloader.cpp  282  warn  V519 The 'created' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 278, 282.
components/esm/loadregn.cpp  119  err  V586 The 'clear' function is called twice for deallocation of the same resource. Check lines: 112, 119.
components/esm/cellref.cpp  178  warn  V581 The conditional expressions of the 'if' statements situated alongside each other are identical. Check lines: 175, 178.
components/esmterrain/storage.cpp  235  warn  V560 A part of conditional expression is always true: colStart == 0.
components/esmterrain/storage.cpp  237  warn  V560 A part of conditional expression is always true: rowStart == 0.
2018-04-18 12:36:10 +00:00
Andreas Sturmlechner
2c9d46a60b
Fix build with Qt 5.11_beta3 (dropping qt5_use_modules) 2018-04-17 23:03:56 +02:00
Capostrophic
5a3086b0c6
Auto-detect the actual Morrowind assets path (Fixes #4336) 2018-03-23 23:52:08 +03:00
scrawl
80f7279a4d
Change default installation directory from 'data' to 'basedata' (Bug #3557) 2018-01-14 00:24:30 +00:00
AnyOldName3
5ce34f1cbf Move new behaviour into macro to reduce code duplication 2017-09-08 22:17:42 +01:00
AnyOldName3
3c0ec0d6d0 If CMake supports it, sets the debugger working directory for Visual Studio 2017-09-08 17:26:46 +01:00
Thunderforge
f41a4bb937 Changing "New Installation" to "Retail CD/DVD" for clarity 2017-08-09 00:20:49 -05:00
Siimacore
6af470ff03 Stopping the thread in the wizard that prevented it to stop correctly 2017-06-13 12:00:55 +02:00
Leon Krieg
c7b4b2cdd7 Fixed multiple spelling mistakes 2016-12-14 16:39:33 +01:00
scrawl
5297d7b5be Merge pull request #1137 from nikolaykasyanov/osx-structure
[macOS] Move all resources files inside application bundles (fixes #3566)
2016-11-25 02:51:32 +01:00
Nikolay Kasyanov
db69342b5d [macOS] Move all configs & resources into app bundles
Fixes #3566 (https://bugs.openmw.org/issues/3566).
2016-11-23 22:32:54 +01:00
scrawl
9d125bcaa2 Merge pull request #1129 from PhillipAnd/phillipand-cmake-fix
Fix various build issues with Visual Studio environment
2016-11-17 18:25:23 +01:00
Phillip Andrews
aeaedbc57a Moved install commands to target-specific cmakelists so that all configurations work. 2016-11-13 22:49:01 -06:00
Allofich
3420121c3f Fix shadowing warnings 2016-11-13 23:20:51 +09:00
scrawl
e0f613661e Fix char -> int, fix shadowing warning 2016-10-30 20:10:33 +01:00
Allofich
125e94ef0e Fix shadowing warnings 2016-10-31 00:39:31 +09:00
Mikhail Korolev
7e2fe77836 apps/wizard: (trivial) fix misplaced arguments in installFile for installFiles 2016-09-15 19:03:07 +03:00
David Carlier
83bab29e4b Mainly making compilable under OpenBSD.
Renaming one resource file as the space led to issue for qt/moc.
2016-08-06 19:00:27 +01:00
Roman Proskuryakov
edb41b5b08 Rewrites FindLIBUNSHIELD using LibFindMacros
Renames LIBUNSHIELD_INCLUDE_DIR -> LIBUNSHIELD_INCLUDE_DIRS, LIBUNSHIELD_LIBRARY -> LIBUNSHIELD_LIBRARIES
2016-06-12 14:44:04 +03:00
Alexander "Ace" Olofsson
fe241be26c Merge branch 'master' of git://github.com/OpenMW/openmw into appveyor 2015-12-24 11:27:02 +01:00
Alexander "Ace" Olofsson
2142d0d2d6 Make Qt5 happy 2015-12-24 02:48:00 +01:00
scrawl
2f9b404094 InstallationPage: properly exit the QThread (Fixes #2210) 2015-12-08 21:41:35 +01:00
scrawl
2ffcc2a2b4 Fix incorrect path encoding handling in debug message 2015-11-26 17:34:22 +01:00
scrawl
609e146a22 Build fixes for windows 2015-06-15 16:48:18 +02:00
scrawl
e13a938896 Add support to build with Qt5 (Task #2665)
Known issue: the render view doesn't work in Qt5. With the switch to OSG around the corner, this isn't worth fixing.
2015-06-12 15:13:42 +02:00
scrawl
4b5c2398a1 Remove QTextCodec::setCodecForCStrings
Not needed, we're using QString::fromUtf8/toUtf8 to handle encodings correctly.
2015-06-12 02:00:06 +02:00
scrawl
cf95d3fc35 Refactor cmake scripts, reducing the amount of find_package(Boost) 2015-06-12 01:45:19 +02:00
scrawl
fc5176dc38 Refactor cmake scripts, reducing the amount of find_package(Qt4) 2015-06-11 23:38:08 +02:00
Rohit Nirmal
997347b01e Silence -Wreorder warnings. 2015-04-28 18:48:02 -05:00
dteviot
2ef7fc4e2c Installer work for Windows (Fixes #1621)
1. Correctly reads Windows registry for vanilla MW install location.
2. Populates existing installation page with location of vanilla, when found.
3. On Windows, installer wizard now gets to Import page.
2015-03-15 08:08:55 +13:00
scrawl
e0d0997409 Rename omwlauncher -> openmw-launcher, mwiniimport -> openmw-iniimporter 2015-01-31 22:40:38 +01:00
scrawl
697ab16ec5 Fix for coverity defects 2015-01-27 19:00:26 +01:00
dteviot
05b89be8bf Launcher sets content list to match values in openmw.cfg (Fixes #811)
I took the liberty to add accessor & mutator functions for classes ContentListsGameSettings and LauncherSettings , as existing code can reverse order of entries.
Also replaced some "magic strings" with named constants.
2015-01-10 18:46:47 +13:00
Bret Curtis
dcfadeb51a fix typo and annoying gcc/clang unused return values in crash catcher 2014-12-22 10:45:34 +01:00
Marc Zinnschlag
e755f692cc silenced some annoying warnings 2014-12-03 09:42:12 +01:00
Marc Zinnschlag
003675318d Merge remote-tracking branch 'scrawl/master' 2014-11-29 20:54:04 +01:00
scrawl
ff8bdd74ed Fix strange bitflags handling 2014-11-25 15:54:55 +01:00
cc9cii
69134e3ac2 Add icon to windows executable. 2014-11-24 12:48:36 +11:00
scrawl
4bf5c89e6f Merge branch 'master' of https://github.com/OpenMW/openmw into unshield
Conflicts:
	apps/wizard/CMakeLists.txt
2014-11-23 13:45:46 +01:00
scrawl
abf49267ea Unshield include fix 2014-11-23 13:44:03 +01:00
scrawl
a8a2b44b0f Don't require libunshield on windows 2014-11-23 00:51:57 +01:00
Nikolay Kasyanov
a0c454b01c Properly add libunshiled include dir (again, for wizard this time) 2014-11-22 22:53:01 +02:00
scrawl
1e06f69d9e Remove the "browse to existing installation" button, now replaced by the wizard
Clean up some debug spam
2014-11-20 22:39:34 +01:00
pvdk
6348af586e Fixed some problems with the launcher and the wizard 2014-05-30 02:12:48 +02:00
pvdk
a390dde818 Fixed importing configurations of existing installations 2014-05-29 21:17:49 +02:00
pvdk
2a6a26c0d0 Minor fixes 2014-05-29 21:02:06 +02:00
pvdk
88064f4946 Fix for MOC error due to Boost includes 2014-05-29 20:35:07 +02:00
pvdk
aa07a33906 Fixed most of the memory leaks and started working on correctly exiting the thread 2014-04-18 13:17:37 +02:00
pvdk
5d94cb112f Fixed segfault bug due to accessing members of unitialized struct 2014-04-17 02:16:41 +02:00
pvdk
6ed76858d9 Fixed some minor problems with the wizard 2014-04-16 23:59:25 +02:00
pvdk
f8bb797b8a Settings tab is fully functional now 2014-04-16 18:34:24 +02:00
pvdk
21c406316f Working on the Settings tab: start the importer/wizard 2014-04-16 16:54:55 +02:00
pvdk
14b164a03d Reverted an unneeded fix 2014-03-30 23:11:38 +02:00
pvdk
10d2ca82f7 Implemented a simple logger 2014-03-30 22:58:50 +02:00
pvdk
eb04fa85b7 Added background image to the last page too 2014-03-29 11:57:25 +01:00
pvdk
ef617fdf3d Fail on the first error whilst extracting an archive 2014-03-18 00:33:31 +01:00
pvdk
667b0de250 Fixed problems with cd content autodetection 2014-03-17 23:39:21 +01:00
pvdk
2e1248537e Minor fixes, installation should stop after one error message now 2014-03-17 21:33:44 +01:00
pvdk
9e5e19f9cb Improved existing installation handling 2014-03-17 18:28:05 +01:00
pvdk
ae5f783a16 Added some eye-candy to the wizard: a watermark and a placeholder icon 2014-03-17 17:50:51 +01:00
pvdk
254fe0a424 Made install functions use file finding methods and improved error handling 2014-03-17 14:31:50 +01:00
pvdk
ef16b46148 Wizard now autodetects correct installation archive 2014-03-16 22:09:20 +01:00
pvdk
b2156351d8 Work in progress commit, working on data1.hdr autodetection 2014-03-16 20:07:54 +01:00
pvdk
05f8af0757 Use the correct encoding for the ini importer 2014-02-25 18:15:29 +01:00
pvdk
6b9082c6ba Support different Tribunal patch .esm location, as seen on German GoTY disk 2014-02-25 17:36:55 +01:00
pvdk
d30c4edb14 Support separate Splash directory, found in some installation media cabinets 2014-02-25 17:23:26 +01:00
pvdk
3792b301e9 Wizard now runs the ini-importer to import settings from Morrowind.ini 2014-02-25 15:33:30 +01:00
pvdk
36d4287da4 Fixed openmw.cfg handling: file should not be cleared anymore 2014-02-24 15:59:44 +01:00
pvdk
755c99df3c Some minor fixes 2014-02-19 19:26:51 +01:00
pvdk
6916c0bc94 Wizard now writes valid Morrowind.ini files 2014-02-19 19:26:51 +01:00
pvdk
e8170adde5 Some minor changes, implemented suggestions 2014-02-19 19:26:50 +01:00
pvdk
ceb66d0790 Also install the separate Sounds directory for Tribunal 2014-02-19 19:26:50 +01:00
pvdk
5024f1bf77 Added a warning when trying to install tribunal after bloodmoon 2014-02-19 19:26:50 +01:00
pvdk
2ccf4d6112 Post-merge cleanups, using confignmanager for XDG paths now, thanks scrawl! 2014-02-19 19:26:50 +01:00
pvdk
1262eab03a Added some nice error messages to the installation process 2014-01-28 01:03:47 +01:00
pvdk
2736527e5a Did some cleanup work on the unshield thread: more code re-use 2014-01-27 22:54:14 +01:00
pvdk
3fd88aca59 Re-added support for GoTY disks and added a messagebox, displayed when done 2014-01-27 16:51:22 +01:00
pvdk
8db333c8d0 Made the getter/setter functions thread-safe 2014-01-27 15:12:02 +01:00
pvdk
cdbf5c68b0 Implemented selection of installation media and added forgotten file 2014-01-24 22:25:22 +01:00
pvdk
0f7f3391f7 WIP: Working on the installation of addons 2014-01-17 13:21:44 +01:00
pvdk
691e007524 Redid the unshield thread stuff, this time the way it should be done 2014-01-01 22:46:29 +01:00
pvdk
a2ca7b92a2 Working on the unshield implementation, added support for moving temp files 2014-01-01 17:15:34 +01:00
pvdk
3a55d88bac Working on the installshield thread 2013-12-26 18:02:34 +01:00
pvdk
40486370d9 Working on the Unshield functionality 2013-12-25 18:52:34 +01:00
pvdk
dddd9cba57 Added data path retrieval from openmw.cfg, to use as existing installs 2013-12-25 15:50:02 +01:00
pvdk
3a37761d76 Some minor cleanups 2013-12-24 23:47:04 +01:00
pvdk
445f96434e Added Morrowind.ini detection logic 2013-12-24 23:09:31 +01:00
pvdk
8ea31e5050 Working on a Morrowind.ini reader 2013-12-24 19:38:21 +01:00
pvdk
30710bad70 Modified components widget so the checked items can be stored for all pages to access 2013-12-15 15:13:49 +01:00
pvdk
77fe73799a Enabled language setting to be accessable from different pages 2013-12-15 13:12:48 +01:00
pvdk
7132b9b0c5 Implement default installation path support for all platforms 2013-12-13 23:48:55 +01:00
pvdk
c82f0ec35f Implemented the language selection page 2013-12-13 15:30:49 +01:00
pvdk
d7f9604140 WIP: Working on the installation selection and added the ui for the language page 2013-12-13 13:38:49 +01:00
pvdk
0e1d3237fe Added some logic to the page switching 2013-12-08 22:58:29 +01:00
pvdk
8162f8370b Added all the pages to the wizard 2013-12-08 21:35:57 +01:00
pvdk
f458f0c6c1 Added the Wizard .ui/resource files and some basic source to get started 2013-12-07 23:17:50 +01:00