().find(factionId);
- if(rank < 0 || rank > 9)
+ if(rank < 0)
return "";
return faction->mRanks[rank];
diff --git a/apps/openmw/mwstate/quicksavemanager.cpp b/apps/openmw/mwstate/quicksavemanager.cpp
index 4bae9e674..9f522d7eb 100644
--- a/apps/openmw/mwstate/quicksavemanager.cpp
+++ b/apps/openmw/mwstate/quicksavemanager.cpp
@@ -1,11 +1,11 @@
#include "quicksavemanager.hpp"
MWState::QuickSaveManager::QuickSaveManager(std::string &saveName, unsigned int maxSaves)
+ : mSaveName(saveName)
+ , mMaxSaves(maxSaves)
+ , mOldestSlotVisited(NULL)
+ , mSlotsVisited(0)
{
- this->mSaveName = saveName;
- this->mMaxSaves = maxSaves;
- this->mOldestSlotVisited = NULL;
- this->mSlotsVisited = 0;
}
void MWState::QuickSaveManager::visitSave(const Slot *saveSlot)
diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index 9b8c8c6a4..988b2262b 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -865,7 +865,6 @@ namespace MWWorld
if (mCell->mData.mFlags & ESM::Cell::Interior && mCell->mData.mFlags & ESM::Cell::HasWater)
mWaterLevel = state.mWaterLevel;
- mWaterLevel = state.mWaterLevel;
mLastRespawn = MWWorld::TimeStamp(state.mLastRespawn);
}
@@ -876,7 +875,6 @@ namespace MWWorld
if (mCell->mData.mFlags & ESM::Cell::Interior && mCell->mData.mFlags & ESM::Cell::HasWater)
state.mWaterLevel = mWaterLevel;
- state.mWaterLevel = mWaterLevel;
state.mHasFogOfWar = (mFogState.get() ? 1 : 0);
state.mLastRespawn = mLastRespawn.toEsm();
}
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 49e3d1aaa..b93753fc5 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -528,8 +528,7 @@ namespace MWWorld
float z = pos.rot[2];
world->rotateObject(player, x, y, z);
- if (adjustPlayerPos)
- player.getClass().adjustPosition(player, true);
+ player.getClass().adjustPosition(player, true);
}
MWBase::MechanicsManager *mechMgr =
diff --git a/apps/openmw/mwworld/weather.cpp b/apps/openmw/mwworld/weather.cpp
index c958572ca..155e4340a 100644
--- a/apps/openmw/mwworld/weather.cpp
+++ b/apps/openmw/mwworld/weather.cpp
@@ -1134,7 +1134,6 @@ inline void WeatherManager::calculateTransitionResult(const float factor, const
mResult.mIsStorm = current.mIsStorm;
mResult.mParticleEffect = current.mParticleEffect;
mResult.mRainEffect = current.mRainEffect;
- mResult.mParticleEffect = current.mParticleEffect;
mResult.mRainSpeed = current.mRainSpeed;
mResult.mRainFrequency = current.mRainFrequency;
mResult.mAmbientSoundVolume = 1-(factor*2);
@@ -1146,7 +1145,6 @@ inline void WeatherManager::calculateTransitionResult(const float factor, const
mResult.mIsStorm = other.mIsStorm;
mResult.mParticleEffect = other.mParticleEffect;
mResult.mRainEffect = other.mRainEffect;
- mResult.mParticleEffect = other.mParticleEffect;
mResult.mRainSpeed = other.mRainSpeed;
mResult.mRainFrequency = other.mRainFrequency;
mResult.mAmbientSoundVolume = 2*(factor-0.5f);
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 44438f772..df9fe175c 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -439,7 +439,6 @@ namespace MWWorld
gmst["sCompanionWarningMessage"] = ESM::Variant("Warning message");
gmst["sCompanionWarningButtonOne"] = ESM::Variant("Button 1");
gmst["sCompanionWarningButtonTwo"] = ESM::Variant("Button 2");
- gmst["sCompanionShare"] = ESM::Variant("Companion Share");
gmst["sProfitValue"] = ESM::Variant("Profit Value");
gmst["sTeleportDisabled"] = ESM::Variant("Teleport disabled");
gmst["sLevitateDisabled"] = ESM::Variant("Levitate disabled");
diff --git a/apps/wizard/CMakeLists.txt b/apps/wizard/CMakeLists.txt
index 5f7338e52..8d97bbcbf 100644
--- a/apps/wizard/CMakeLists.txt
+++ b/apps/wizard/CMakeLists.txt
@@ -118,7 +118,7 @@ if (DESIRED_QT_VERSION MATCHES 4)
target_link_libraries(openmw-wizard ${QT_QTMAIN_LIBRARY})
endif()
else()
- qt5_use_modules(openmw-wizard Widgets Core)
+ target_link_libraries(openmw-wizard Qt5::Widgets Qt5::Core)
endif()
if (OPENMW_USE_UNSHIELD)
diff --git a/apps/wizard/installationpage.cpp b/apps/wizard/installationpage.cpp
index 7a4dcbf10..3deb30f25 100644
--- a/apps/wizard/installationpage.cpp
+++ b/apps/wizard/installationpage.cpp
@@ -161,7 +161,7 @@ void Wizard::InstallationPage::showFileDialog(Wizard::Component component)
if (path.isEmpty()) {
logTextEdit->appendHtml(tr("
\
- Error: The installation was aborted by the user
"));
+ Error: The installation was aborted by the user"));
mWizard->addLogText(QLatin1String("Error: The installation was aborted by the user"));
mWizard->mError = true;
diff --git a/apps/wizard/unshield/unshieldworker.cpp b/apps/wizard/unshield/unshieldworker.cpp
index 020de9f80..9cdb4cd78 100644
--- a/apps/wizard/unshield/unshieldworker.cpp
+++ b/apps/wizard/unshield/unshieldworker.cpp
@@ -472,8 +472,8 @@ bool Wizard::UnshieldWorker::setupComponent(Component component)
if (morrowindFound) {
// Check if we have correct archive, other archives have Morrowind.bsa too
- if ((tribunalFound && bloodmoonFound)
- || (!tribunalFound && !bloodmoonFound)) {
+ if (tribunalFound == bloodmoonFound)
+ {
cabFile = file;
found = true; // We have a GoTY disk or a Morrowind-only disk
}
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 48e5aa4e8..2c087aec3 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -274,7 +274,7 @@ if (USE_QT)
${QT_QTCORE_LIBRARY}
${QT_QTGUI_LIBRARY})
else()
- qt5_use_modules(components Widgets Core)
+ target_link_libraries(components Qt5::Widgets Qt5::Core)
endif()
endif()
diff --git a/components/esm/cellref.cpp b/components/esm/cellref.cpp
index cdf2a87ed..567994224 100644
--- a/components/esm/cellref.cpp
+++ b/components/esm/cellref.cpp
@@ -173,10 +173,10 @@ void ESM::CellRef::save (ESMWriter &esm, bool wideRefNum, bool inInventory, bool
}
if (!inInventory)
+ {
esm.writeHNOCString ("KNAM", mKey);
-
- if (!inInventory)
esm.writeHNOCString ("TNAM", mTrap);
+ }
if (mReferenceBlocked != -1)
esm.writeHNT("UNAM", mReferenceBlocked);
@@ -188,7 +188,7 @@ void ESM::CellRef::save (ESMWriter &esm, bool wideRefNum, bool inInventory, bool
void ESM::CellRef::blank()
{
mRefNum.unset();
- mRefID.clear();
+ mRefID.clear();
mScale = 1;
mOwner.clear();
mGlobalVariable.clear();
@@ -205,7 +205,7 @@ void ESM::CellRef::blank()
mTrap.clear();
mReferenceBlocked = -1;
mTeleport = false;
-
+
for (int i=0; i<3; ++i)
{
mDoorDest.pos[i] = 0;
diff --git a/components/esm/loadregn.cpp b/components/esm/loadregn.cpp
index 6e0e6db9d..e708bbb4e 100644
--- a/components/esm/loadregn.cpp
+++ b/components/esm/loadregn.cpp
@@ -109,8 +109,6 @@ namespace ESM
void Region::blank()
{
- mName.clear();
-
mData.mClear = mData.mCloudy = mData.mFoggy = mData.mOvercast = mData.mRain =
mData.mThunder = mData.mAsh, mData.mBlight = mData.mA = mData.mB = 0;
diff --git a/components/esmterrain/storage.cpp b/components/esmterrain/storage.cpp
index 63efb36be..dc144d119 100644
--- a/components/esmterrain/storage.cpp
+++ b/components/esmterrain/storage.cpp
@@ -232,9 +232,9 @@ namespace ESMTerrain
// Skip the first row / column unless we're at a chunk edge,
// since this row / column is already contained in a previous cell
// This is only relevant if we're creating a chunk spanning multiple cells
- if (colStart == 0 && vertY_ != 0)
+ if (vertY_ != 0)
colStart += increment;
- if (rowStart == 0 && vertX_ != 0)
+ if (vertX_ != 0)
rowStart += increment;
// Only relevant for chunks smaller than (contained in) one cell
diff --git a/components/fontloader/fontloader.cpp b/components/fontloader/fontloader.cpp
index d2c97953c..080739bc1 100644
--- a/components/fontloader/fontloader.cpp
+++ b/components/fontloader/fontloader.cpp
@@ -448,7 +448,7 @@ namespace Gui
MyGUI::FontCodeType::Enum type;
if(i == 0)
type = MyGUI::FontCodeType::Selected;
- else if (i == 1)
+ else // if (i == 1)
type = MyGUI::FontCodeType::SelectedBack;
MyGUI::xml::ElementPtr cursorCode = codes->createChild("Code");
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 6e04c6405..0add92f29 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -275,7 +275,6 @@ namespace NifOsg
for (unsigned int i=0; igetNumChildren(); ++i)
skel->addChild(root->getChild(i));
root->removeChildren(0, root->getNumChildren());
- created = skel;
}
else
skel->addChild(created);
diff --git a/components/sceneutil/morphgeometry.hpp b/components/sceneutil/morphgeometry.hpp
index 122c1456c..ba3b40961 100644
--- a/components/sceneutil/morphgeometry.hpp
+++ b/components/sceneutil/morphgeometry.hpp
@@ -21,6 +21,9 @@ namespace SceneUtil
/// @note The source geometry will not be modified.
void setSourceGeometry(osg::ref_ptr sourceGeom);
+ // Currently empty as this is difficult to implement. Technically we would need to compile both internal geometries in separate frames but this method is only called once. Alternatively we could compile just the static parts of the model.
+ virtual void compileGLObjects(osg::RenderInfo& renderInfo) const {}
+
class MorphTarget
{
protected:
diff --git a/components/sceneutil/riggeometry.hpp b/components/sceneutil/riggeometry.hpp
index 64f4bf312..60b3edc9d 100644
--- a/components/sceneutil/riggeometry.hpp
+++ b/components/sceneutil/riggeometry.hpp
@@ -23,8 +23,8 @@ namespace SceneUtil
META_Object(SceneUtil, RigGeometry)
- // At this point compileGLObjects() remains unimplemented, hard to avoid race conditions
- // and there is limited value in compiling anyway since the data will change again for the next frame
+ // Currently empty as this is difficult to implement. Technically we would need to compile both internal geometries in separate frames but this method is only called once. Alternatively we could compile just the static parts of the model.
+ virtual void compileGLObjects(osg::RenderInfo& renderInfo) const {}
struct BoneInfluence
{
diff --git a/extern/osgQt/CMakeLists.txt b/extern/osgQt/CMakeLists.txt
index 3bd08a390..78a4e6034 100644
--- a/extern/osgQt/CMakeLists.txt
+++ b/extern/osgQt/CMakeLists.txt
@@ -12,7 +12,7 @@ if (DESIRED_QT_VERSION MATCHES 4)
include(${QT_USE_FILE})
target_link_libraries(${OSGQT_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTOPENGL_LIBRARY})
else()
- qt5_use_modules(${OSGQT_LIBRARY} Core OpenGL)
+ target_link_libraries(${OSGQT_LIBRARY} Qt5::Core Qt5::OpenGL)
endif()
link_directories(${CMAKE_CURRENT_BINARY_DIR})
diff --git a/plugins/mygui_resource_plugin/CMakeLists.txt b/plugins/mygui_resource_plugin/CMakeLists.txt
deleted file mode 100644
index be834b17d..000000000
--- a/plugins/mygui_resource_plugin/CMakeLists.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-set (MYGUI_RESOURCE_PLUGIN_SOURCES
- plugin.hpp
- plugin.cpp
- plugin_export.cpp
-)
-
-set (MYGUI_RESOURCE_PLUGIN_LIBRARY
- Plugin_MyGUI_OpenMW_Resources
-)
-
-add_definitions("-D_USRDLL -DMYGUI_BUILD_DLL")
-
-add_library(${MYGUI_RESOURCE_PLUGIN_LIBRARY}
- SHARED
- ${MYGUI_RESOURCE_PLUGIN_SOURCES}
- )
-
-if(WIN32)
- if(MSVC)
- # from top-level CMakelists.txt:
- # 4305 - Truncating value (double to float, for example)
- set_target_properties(${MYGUI_RESOURCE_PLUGIN_LIBRARY} PROPERTIES COMPILE_FLAGS "/wd4305")
- endif(MSVC)
-endif(WIN32)
-
-set_target_properties(${MYGUI_RESOURCE_PLUGIN_LIBRARY} PROPERTIES PREFIX "")
-
-target_link_libraries(${MYGUI_RESOURCE_PLUGIN_LIBRARY}
- ${OGRE_LIBRARIES}
- components
-)
diff --git a/plugins/mygui_resource_plugin/plugin.cpp b/plugins/mygui_resource_plugin/plugin.cpp
deleted file mode 100644
index 1b718b547..000000000
--- a/plugins/mygui_resource_plugin/plugin.cpp
+++ /dev/null
@@ -1,183 +0,0 @@
-#include "plugin.hpp"
-
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include
-#include
-#include
-
-#include
-#include
-
-#include
-#include
-
-//FIXME: code duplication
-namespace boost
-{
-struct FallbackMap {
- std::map mMap;
-};
-
-void validate(boost::any &v, std::vector const &tokens, FallbackMap*, int)
-{
- if(v.empty())
- {
- v = boost::any(FallbackMap());
- }
-
- FallbackMap *map = boost::any_cast(&v);
-
- for(std::vector::const_iterator it=tokens.begin(); it != tokens.end(); ++it)
- {
- int sep = it->find(",");
- if(sep < 1 || sep == (int)it->length()-1)
-#if (BOOST_VERSION < 104200)
- throw boost::program_options::validation_error("invalid value");
-#else
- throw boost::program_options::validation_error(boost::program_options::validation_error::invalid_option_value);
-#endif
-
- std::string key(it->substr(0,sep));
- std::string value(it->substr(sep+1));
-
- if(map->mMap.find(key) == map->mMap.end())
- {
- map->mMap.insert(std::make_pair (key,value));
- }
- }
-}
-}
-
-namespace MyGUIPlugin
-{
-
- // Dummy - obsolete when using MyGUI git, because the ScrollBar there has autorepeat support added.
- class MWScrollBar : public MyGUI::ScrollBar
- {
- MYGUI_RTTI_DERIVED(MWScrollBar)
- };
-
- const std::string& ResourcePlugin::getName() const
- {
- static const std::string name = "OpenMW resource plugin";
- return name;
- }
-
- void ResourcePlugin::install()
- {
-
- }
- void ResourcePlugin::uninstall()
- {
-
- }
-
- void ResourcePlugin::registerResources()
- {
- boost::program_options::variables_map variables;
-
- boost::program_options::options_description desc("Allowed options");
- desc.add_options()
- ("data", boost::program_options::value()->default_value(Files::PathContainer(), "data")->multitoken()->composing())
- ("data-local", boost::program_options::value()->default_value(""))
- ("fs-strict", boost::program_options::value()->implicit_value(true)->default_value(false))
- ("fallback-archive", boost::program_options::value >()->
- default_value(std::vector(), "fallback-archive")->multitoken())
- ("encoding", boost::program_options::value()->default_value("win1252"))
- ("fallback", boost::program_options::value()->default_value(boost::FallbackMap(), "")
- ->multitoken()->composing(), "fallback values");
-
- boost::program_options::notify(variables);
-
- Files::ConfigurationManager cfgManager;
- cfgManager.readConfiguration(variables, desc);
-
- std::vector archives = variables["fallback-archive"].as >();
- bool fsStrict = variables["fs-strict"].as();
-
- Files::PathContainer dataDirs, dataLocal;
- if (!variables["data"].empty()) {
- dataDirs = Files::PathContainer(variables["data"].as());
- }
-
- std::string local = variables["data-local"].as();
- if (!local.empty()) {
- dataLocal.push_back(Files::PathContainer::value_type(local));
- }
-
- cfgManager.processPaths (dataDirs);
- cfgManager.processPaths (dataLocal, true);
-
- if (!dataLocal.empty())
- dataDirs.insert (dataDirs.end(), dataLocal.begin(), dataLocal.end());
-
- Files::Collections collections (dataDirs, !fsStrict);
-
- Bsa::registerResources(collections, archives, true, fsStrict);
-
- std::string encoding(variables["encoding"].as());
- std::cout << ToUTF8::encodingUsingMessage(encoding) << std::endl;
-
- Gui::FontLoader loader(ToUTF8::calculateEncoding(encoding));
- loader.loadAllFonts(false);
-
- mFallbackMap = variables["fallback"].as().mMap;
- }
-
- void ResourcePlugin::registerWidgets()
- {
- MyGUI::FactoryManager::getInstance().registerFactory("Widget");
-
- Gui::registerAllWidgets();
- }
-
- void ResourcePlugin::createTransparentBGTexture()
- {
- // This texture is manually created in OpenMW to be able to change its opacity at runtime in the options menu
- Ogre::TexturePtr tex = Ogre::TextureManager::getSingleton().createManual(
- "transparent.png",
- Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME,
- Ogre::TEX_TYPE_2D,
- 1, 1,
- 0,
- Ogre::PF_A8R8G8B8,
- Ogre::TU_WRITE_ONLY);
- std::vector buffer;
- buffer.resize(1);
- const float val = 0.7;
- buffer[0] = (int(255*val) << 24) | (255 << 16) | (255 << 8) | 255;
- memcpy(tex->getBuffer()->lock(Ogre::HardwareBuffer::HBL_DISCARD), &buffer[0], 1*4);
- tex->getBuffer()->unlock();
- }
-
- void ResourcePlugin::initialize()
- {
- MYGUI_LOGGING("OpenMW_Resource_Plugin", Info, "initialize");
-
- registerResources();
- registerWidgets();
- createTransparentBGTexture();
-
- MyGUI::LanguageManager::getInstance().eventRequestTag = MyGUI::newDelegate(this, &ResourcePlugin::onRetrieveTag);
- }
-
- void ResourcePlugin::shutdown()
- {
- /// \todo cleanup
-
- MYGUI_LOGGING("OpenMW_Resource_Plugin", Info, "shutdown");
- }
-
- void ResourcePlugin::onRetrieveTag(const MyGUI::UString& tag, MyGUI::UString& out)
- {
- if (!Gui::replaceTag(tag, out, mFallbackMap))
- out = tag;
- }
-
-}
diff --git a/plugins/mygui_resource_plugin/plugin.hpp b/plugins/mygui_resource_plugin/plugin.hpp
deleted file mode 100644
index 6a06060d9..000000000
--- a/plugins/mygui_resource_plugin/plugin.hpp
+++ /dev/null
@@ -1,52 +0,0 @@
-#ifndef OPENMW_MYGUI_RESOURCE_PLUGIN_H
-#define OPENMW_MYGUI_RESOURCE_PLUGIN_H
-
-#include
-#include
-
-namespace MyGUIPlugin
-{
-
- /**
- * @brief MyGUI plugin used to register Morrowind resources, custom widgets used in OpenMW, and load Morrowind fonts.
- * @paragraph The plugin isn't used in OpenMW itself, but it is useful with the standalone MyGUI tools. To use it,
- * change EditorPlugin.xml in Media/Tools/LayoutEditor/EditorPlugin.xml and add an entry for this plugin.
- */
- class ResourcePlugin : public MyGUI::IPlugin
- {
- /*! Get the name of the plugin.
- @remarks An implementation must be supplied for this method to uniquely
- identify the plugin
- */
- virtual const std::string& getName() const;
-
- /*! Perform the plugin initial installation sequence
- */
- virtual void install();
-
- /*! Perform any tasks the plugin needs to perform on full system
- initialisation.
- */
- virtual void initialize();
-
- /*! Perform any tasks the plugin needs to perform when the system is shut down
- */
- virtual void shutdown();
-
- /*! Perform the final plugin uninstallation sequence
- */
- virtual void uninstall();
-
- private:
- void registerResources();
- void registerWidgets();
- void createTransparentBGTexture();
-
- void onRetrieveTag(const MyGUI::UString& tag, MyGUI::UString& out);
-
- std::map mFallbackMap;
- };
-
-}
-
-#endif
diff --git a/plugins/mygui_resource_plugin/plugin_export.cpp b/plugins/mygui_resource_plugin/plugin_export.cpp
deleted file mode 100644
index 0d6b4b804..000000000
--- a/plugins/mygui_resource_plugin/plugin_export.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "plugin.hpp"
-#include "MyGUI_PluginManager.h"
-
-MyGUIPlugin::ResourcePlugin* plugin_item = nullptr;
-
-extern "C" MYGUI_EXPORT_DLL void dllStartPlugin(void)
-{
- plugin_item = new MyGUIPlugin::ResourcePlugin();
- MyGUI::PluginManager::getInstance().installPlugin(plugin_item);
-}
-
-extern "C" MYGUI_EXPORT_DLL void dllStopPlugin(void)
-{
- MyGUI::PluginManager::getInstance().uninstallPlugin(plugin_item);
- delete plugin_item;
- plugin_item = nullptr;
-}