mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-10 16:14:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'coverity' into 'master'

Browse Source 
Coverity issues, part 2

See merge request OpenMW/openmw!2100
This commit is contained in:
psi29a 2022-07-05 15:47:19 +00:00
commit 46694a5e81
6 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/essimporter/importacdt.cpp
View File

@ -9,6 +9,8 @@ namespace ESSImport
void ActorData::load(ESM::ESMReader &esm)
{
blank();
if (esm.isNextSub("ACTN"))
{
/*

2
apps/openmw/mwrender/pingpongcull.cpp
View File

@ -39,6 +39,8 @@ namespace MWRender
size_t frameId = frame % 2;
MWRender::PostProcessor* postProcessor = dynamic_cast<MWRender::PostProcessor*>(cv->getCurrentCamera()->getUserData());
if (!postProcessor)
throw std::runtime_error("PingPongCull: failed to get a PostProcessor!");
if (Stereo::getStereo())
{

4
apps/openmw/mwworld/store.cpp
View File

@ -528,6 +528,10 @@ namespace MWWorld
newCell.mAmbi.mSunlight = 0;
newCell.mAmbi.mFog = 0;
newCell.mAmbi.mFogDensity = 0;
newCell.mCellId.mPaged = true;
newCell.mCellId.mIndex.mX = x;
newCell.mCellId.mIndex.mY = y;
return &mExt.insert(std::make_pair(key, newCell)).first->second;
}
const ESM::Cell *Store<ESM::Cell>::find(const std::string &id) const

1
apps/openmw/mwworld/worldimp.cpp
View File

@ -460,6 +460,7 @@ namespace MWWorld
ESM::GameSetting record;
record.mId = params.first;
record.mValue = params.second;
record.mRecordFlags = 0;
mStore.insertStatic(record);
}
}

4
components/fx/stateupdater.cpp
View File

@ -40,6 +40,8 @@ namespace fx
if (mUseUBO)
{
osg::UniformBufferBinding* ubb = dynamic_cast<osg::UniformBufferBinding*>(stateset->getAttribute(osg::StateAttribute::UNIFORMBUFFERBINDING, static_cast<int>(Resource::SceneManager::UBOBinding::PostProcessor)));
if (!ubb)
throw std::runtime_error("StateUpdater::apply: failed to get an UniformBufferBinding!");
auto& dest = static_cast<osg::BufferTemplate<UniformData::BufferType>*>(ubb->getBufferData())->getData();
mData.copyTo(dest);
@ -60,4 +62,4 @@ namespace fx
if (mPointLightBuffer)
mPointLightBuffer->applyUniforms(nv->getTraversalNumber(), stateset);
}
}
}

6
components/fx/widgets.hpp
View File

@ -76,8 +76,6 @@ namespace fx
MYGUI_RTTI_DERIVED(EditNumber)
public:
EditNumber() : mLastPointerX(0) {}
void setValue(T value)
{
mValue = value;
@ -241,9 +239,9 @@ namespace fx
MyGUI::Widget* mDragger{nullptr};
MyGUI::Widget* mFill{nullptr};
MyGUI::TextBox* mValueLabel{nullptr};
T mValue;
T mValue{};
int mLastPointerX;
int mLastPointerX{0};
};
class EditNumberFloat4 : public EditNumber<float, osg::Vec4f> { MYGUI_RTTI_DERIVED(EditNumberFloat4) };