Skip to content

Commit

Permalink
Merge branch 'coverity' into 'master'
Browse files Browse the repository at this point in the history 
Coverity fixes

See merge request OpenMW/openmw!4198
  • Loading branch information
@psi29a
psi29a committed Jun 24, 2024
2 parents b8d861c + b0671c7 commit 57adb93
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 11 deletions.
3 changes: 3 additions & 0 deletions apps/openmw/mwgui/windowmanagerimp.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1097,6 +1097,9 @@ namespace MWGui
{
tag = tag.substr(MyGuiPrefix.length());
size_t comma_pos = tag.find(',');
if (comma_pos == std::string_view::npos)
throw std::runtime_error("Invalid setting tag (expected comma): " + std::string(tag));

std::string_view settingSection = tag.substr(0, comma_pos);
std::string_view settingTag = tag.substr(comma_pos + 1, tag.length());

Expand Down
2 changes: 1 addition & 1 deletion apps/openmw/mwlua/magicbindings.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -932,7 +932,7 @@ namespace MWLua
if (stackable)
params.setFlag(ESM::ActiveSpells::Flag_Stackable);

for (auto enam : enams)
for (const ESM::IndexedENAMstruct& enam : enams)
{
const ESM::MagicEffect* mgef = esmStore.get<ESM::MagicEffect>().find(enam.mData.mEffectID);
MWMechanics::ActiveSpells::ActiveEffect effect;
Expand Down
20 changes: 10 additions & 10 deletions components/nifosg/nifloader.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2181,14 +2181,14 @@ namespace NifOsg
}

void handleShaderMaterialNodeProperties(
Bgsm::MaterialFilePtr material, osg::StateSet* stateset, std::vector<unsigned int>& boundTextures)
const Bgsm::MaterialFile* material, osg::StateSet* stateset, std::vector<unsigned int>& boundTextures)
{
const unsigned int uvSet = 0;
const bool wrapS = material->wrapS();
const bool wrapT = material->wrapT();
if (material->mShaderType == Bgsm::ShaderType::Lighting)
{
const Bgsm::BGSMFile* bgsm = static_cast<const Bgsm::BGSMFile*>(material.get());
const Bgsm::BGSMFile* bgsm = static_cast<const Bgsm::BGSMFile*>(material);

if (!bgsm->mDiffuseMap.empty())
attachExternalTexture(
Expand All @@ -2205,7 +2205,7 @@ namespace NifOsg
}
else if (material->mShaderType == Bgsm::ShaderType::Effect)
{
const Bgsm::BGEMFile* bgem = static_cast<const Bgsm::BGEMFile*>(material.get());
const Bgsm::BGEMFile* bgem = static_cast<const Bgsm::BGEMFile*>(material);

if (!bgem->mBaseMap.empty())
attachExternalTexture("diffuseMap", bgem->mBaseMap, wrapS, wrapT, uvSet, stateset, boundTextures);
Expand Down Expand Up @@ -2288,7 +2288,7 @@ namespace NifOsg
}

void handleShaderMaterialDrawableProperties(
Bgsm::MaterialFilePtr shaderMat, osg::ref_ptr<osg::Material> mat, osg::Node& node, bool& hasSortAlpha)
const Bgsm::MaterialFile* shaderMat, osg::ref_ptr<osg::Material> mat, osg::Node& node, bool& hasSortAlpha)
{
mat->setAlpha(osg::Material::FRONT_AND_BACK, shaderMat->mTransparency);
handleAlphaTesting(shaderMat->mAlphaTest, osg::AlphaFunc::GREATER, shaderMat->mAlphaTestThreshold, node);
Expand All @@ -2297,13 +2297,13 @@ namespace NifOsg
handleDecal(shaderMat->mDecal, hasSortAlpha, node);
if (shaderMat->mShaderType == Bgsm::ShaderType::Lighting)
{
auto bgsm = static_cast<const Bgsm::BGSMFile*>(shaderMat.get());
auto bgsm = static_cast<const Bgsm::BGSMFile*>(shaderMat);
mat->setEmission(osg::Material::FRONT_AND_BACK, osg::Vec4f(bgsm->mEmittanceColor, 1.f));
mat->setSpecular(osg::Material::FRONT_AND_BACK, osg::Vec4f(bgsm->mSpecularColor, 1.f));
}
else if (shaderMat->mShaderType == Bgsm::ShaderType::Effect)
{
auto bgem = static_cast<const Bgsm::BGEMFile*>(shaderMat.get());
auto bgem = static_cast<const Bgsm::BGEMFile*>(shaderMat);
mat->setEmission(osg::Material::FRONT_AND_BACK, osg::Vec4f(bgem->mEmittanceColor, 1.f));
if (bgem->mSoft)
SceneUtil::setupSoftEffect(node, bgem->mSoftDepth, true, bgem->mSoftDepth);
Expand Down Expand Up @@ -2537,7 +2537,7 @@ namespace NifOsg
clearBoundTextures(stateset, boundTextures);
if (Bgsm::MaterialFilePtr material = getShaderMaterial(texprop->mName, mMaterialManager))
{
handleShaderMaterialNodeProperties(material, stateset, boundTextures);
handleShaderMaterialNodeProperties(material.get(), stateset, boundTextures);
break;
}
if (!texprop->mTextureSet.empty())
Expand All @@ -2564,7 +2564,7 @@ namespace NifOsg
clearBoundTextures(stateset, boundTextures);
if (Bgsm::MaterialFilePtr material = getShaderMaterial(texprop->mName, mMaterialManager))
{
handleShaderMaterialNodeProperties(material, stateset, boundTextures);
handleShaderMaterialNodeProperties(material.get(), stateset, boundTextures);
break;
}
if (!texprop->mSourceTexture.empty())
Expand Down Expand Up @@ -2783,7 +2783,7 @@ namespace NifOsg
auto shaderprop = static_cast<const Nif::BSLightingShaderProperty*>(property);
if (Bgsm::MaterialFilePtr shaderMat = getShaderMaterial(shaderprop->mName, mMaterialManager))
{
handleShaderMaterialDrawableProperties(shaderMat, mat, *node, hasSortAlpha);
handleShaderMaterialDrawableProperties(shaderMat.get(), mat, *node, hasSortAlpha);
if (shaderMat->mShaderType == Bgsm::ShaderType::Lighting)
{
auto bgsm = static_cast<const Bgsm::BGSMFile*>(shaderMat.get());
Expand All @@ -2809,7 +2809,7 @@ namespace NifOsg
auto shaderprop = static_cast<const Nif::BSEffectShaderProperty*>(property);
if (Bgsm::MaterialFilePtr shaderMat = getShaderMaterial(shaderprop->mName, mMaterialManager))
{
handleShaderMaterialDrawableProperties(shaderMat, mat, *node, hasSortAlpha);
handleShaderMaterialDrawableProperties(shaderMat.get(), mat, *node, hasSortAlpha);
break;
}
handleDecal(shaderprop->decal(), hasSortAlpha, *node);
Expand Down

0 comments on commit 57adb93

Please sign in to comment.