mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-06 00:55:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'coverity' into 'master'

Browse Source 
Fix some Coverity complaints

See merge request OpenMW/openmw!3904
This commit is contained in:
Alexei Kotov 2024-02-24 20:25:58 +00:00
commit 01e0b25fd3
5 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/openmw/mwlua/nearbybindings.cpp
View File

@ -163,8 +163,8 @@ namespace MWLua
ignore = parseIgnoreList(*options);
}
context.mLuaManager->addAction([context, ignore, callback = LuaUtil::Callback::fromLua(callback), from,
to] {
context.mLuaManager->addAction([context, ignore = std::move(ignore),
callback = LuaUtil::Callback::fromLua(callback), from, to] {
MWPhysics::RayCastingResult res;
MWBase::Environment::get().getWorld()->castRenderingRay(res, from, to, false, false, ignore);
context.mLuaManager->queueCallback(callback, sol::main_object(context.mLua->sol(), sol::in_place, res));

2
apps/openmw/mwlua/stats.cpp
View File

@ -476,7 +476,7 @@ namespace MWLua
auto skillIncreasesForAttributeStatsT
= context.mLua->sol().new_usertype<SkillIncreasesForAttributeStats>("SkillIncreasesForAttributeStats");
for (auto attribute : MWBase::Environment::get().getESMStore()->get<ESM::Attribute>())
for (const auto& attribute : MWBase::Environment::get().getESMStore()->get<ESM::Attribute>())
{
skillIncreasesForAttributeStatsT[ESM::RefId(attribute.mId).serializeText()] = sol::property(
[=](const SkillIncreasesForAttributeStats& stat) { return stat.get(context, attribute.mId); },

2
components/debug/debugdraw.cpp
View File

@ -316,8 +316,6 @@ Debug::DebugDrawer::DebugDrawer(const DebugDrawer& copy, const osg::CopyOp& copy
Debug::DebugDrawer::DebugDrawer(Shader::ShaderManager& shaderManager)
{
mCurrentFrame = 0;
auto program = shaderManager.getProgram("debug");
setCullingActive(false);

2
components/debug/debugdraw.hpp
View File

@ -101,7 +101,7 @@ namespace Debug
void addLine(const osg::Vec3& start, const osg::Vec3& end, const osg::Vec3 color = colorWhite);
private:
unsigned int mCurrentFrame;
unsigned int mCurrentFrame = 0;
std::array<osg::ref_ptr<DebugCustomDraw>, 2> mCustomDebugDrawer;
};

2
components/lua/asyncpackage.cpp
View File

@ -94,7 +94,7 @@ namespace LuaUtil
sol::table callbackMeta = Callback::makeMetatable(L);
api["callback"] = [callbackMeta](const AsyncPackageId& asyncId, sol::main_protected_function fn) -> sol::table {
return Callback::make(asyncId, fn, callbackMeta);
return Callback::make(asyncId, std::move(fn), callbackMeta);
};
auto initializer = [](sol::table hiddenData) {