mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-23 16:40:08 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2917 from akortunov/warnfix

Browse source 
Fix issues, reported by CoverityScan
This commit is contained in:
Bret Curtis 2020-06-18 14:44:28 +02:00 committed by GitHub
commit 8d9b2eca7d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/openmw/mwinput/controllermanager.cpp
View file

@ -36,6 +36,7 @@ namespace MWInput
, mSneakToggleShortcutTimer(0.f) , mSneakToggleShortcutTimer(0.f)
, mGamepadZoom(0) , mGamepadZoom(0)
, mGamepadGuiCursorEnabled(true) , mGamepadGuiCursorEnabled(true)
, mGuiCursorEnabled(true)
, mJoystickLastUsed(false) , mJoystickLastUsed(false)
, mSneakGamepadShortcut(false) , mSneakGamepadShortcut(false)
, mGamepadPreviewMode(false) , mGamepadPreviewMode(false)

2
apps/openmw/mwrender/objectpaging.hpp
View file

@ -80,7 +80,7 @@ namespace MWRender
class RefnumMarker : public osg::Object class RefnumMarker : public osg::Object
{ {
public: public:
RefnumMarker() : mNumVertices(0) {} RefnumMarker() : mNumVertices(0) { mRefnum.unset(); }
RefnumMarker(const RefnumMarker &copy, osg::CopyOp co) : mRefnum(copy.mRefnum), mNumVertices(copy.mNumVertices) {} RefnumMarker(const RefnumMarker &copy, osg::CopyOp co) : mRefnum(copy.mRefnum), mNumVertices(copy.mNumVertices) {}
META_Object(MWRender, RefnumMarker) META_Object(MWRender, RefnumMarker)

2
apps/openmw/mwscript/globalscripts.cpp
View file

@ -24,6 +24,7 @@ namespace
{ {
ESM::GlobalScript script; ESM::GlobalScript script;
script.mTargetRef.unset(); script.mTargetRef.unset();
script.mRunning = false;
if (!ptr.isEmpty()) if (!ptr.isEmpty())
{ {
if (ptr.getCellRef().hasContentFile()) if (ptr.getCellRef().hasContentFile())
@ -42,6 +43,7 @@ namespace
ESM::GlobalScript script; ESM::GlobalScript script;
script.mTargetId = pair.second; script.mTargetId = pair.second;
script.mTargetRef = pair.first; script.mTargetRef = pair.first;
script.mRunning = false;
return script; return script;
} }
}; };

9
components/fontloader/fontloader.cpp
View file

@ -165,7 +165,14 @@ namespace Gui
FontLoader::~FontLoader() FontLoader::~FontLoader()
{ {
MyGUI::ResourceManager::getInstance().unregisterLoadXmlDelegate("Resource"); try
{
MyGUI::ResourceManager::getInstance().unregisterLoadXmlDelegate("Resource");
}
catch(const MyGUI::Exception& e)
{
Log(Debug::Error) << "Error in the FontLoader destructor: " << e.what();
}
for (std::vector<MyGUI::ITexture*>::iterator it = mTextures.begin(); it != mTextures.end(); ++it) for (std::vector<MyGUI::ITexture*>::iterator it = mTextures.begin(); it != mTextures.end(); ++it)
delete *it; delete *it;

1
components/terrain/chunkmanager.cpp
View file

@ -28,6 +28,7 @@ ChunkManager::ChunkManager(Storage *storage, Resource::SceneManager *sceneMgr, T
, mSceneManager(sceneMgr) , mSceneManager(sceneMgr)
, mTextureManager(textureManager) , mTextureManager(textureManager)
, mCompositeMapRenderer(renderer) , mCompositeMapRenderer(renderer)
, mNodeMask(0)
, mCompositeMapSize(512) , mCompositeMapSize(512)
, mCompositeMapLevel(1.f) , mCompositeMapLevel(1.f)
, mMaxCompGeometrySize(1.f) , mMaxCompGeometrySize(1.f)