AnarchistGamers/openmw
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-09-23 11:54:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Address more simple Coverity defects

Browse Source
This commit is contained in:
Evil Eye 2025-08-14 11:19:13 +02:00
parent cb0316e6be
commit 9db9df95e2
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/openmw/mwgui/spellmodel.cpp
View File

@ -106,7 +106,7 @@ namespace MWGui
newSpell.mSelected = (MWBase::Environment::get().getWindowManager()->getSelectedSpell() == spell->mId); newSpell.mSelected = (MWBase::Environment::get().getWindowManager()->getSelectedSpell() == spell->mId);
newSpell.mActive = true; newSpell.mActive = true;
newSpell.mCount = 1; newSpell.mCount = 1;
mSpells.push_back(newSpell); mSpells.push_back(std::move(newSpell));
} }
MWWorld::InventoryStore& invStore = mActor.getClass().getInventoryStore(mActor); MWWorld::InventoryStore& invStore = mActor.getClass().getInventoryStore(mActor);

10
apps/openmw/mwlua/types/player.cpp
View File

@ -218,10 +218,10 @@ namespace MWLua
}; };
topicEntryBindingsClass["id"] = sol::readonly_property( topicEntryBindingsClass["id"] = sol::readonly_property(
[](const MWDialogue::Entry& topicEntry) { return topicEntry.mInfoId.serializeText(); }); [](const MWDialogue::Entry& topicEntry) { return topicEntry.mInfoId.serializeText(); });
topicEntryBindingsClass["text"] topicEntryBindingsClass["text"] = sol::readonly_property(
= sol::readonly_property([](const MWDialogue::Entry& topicEntry) { return topicEntry.mText; }); [](const MWDialogue::Entry& topicEntry) -> std::string_view { return topicEntry.mText; });
topicEntryBindingsClass["actor"] topicEntryBindingsClass["actor"] = sol::readonly_property(
= sol::readonly_property([](const MWDialogue::Entry& topicEntry) { return topicEntry.mActorName; }); [](const MWDialogue::Entry& topicEntry) -> std::string_view { return topicEntry.mActorName; });
} }
void addJournalClassJournalEntriesListBindings(sol::state_view& lua, const MWBase::Journal* journal) void addJournalClassJournalEntriesListBindings(sol::state_view& lua, const MWBase::Journal* journal)
@ -255,7 +255,7 @@ namespace MWLua
journalEntryBindingsClass["id"] = sol::readonly_property( journalEntryBindingsClass["id"] = sol::readonly_property(
[](const MWDialogue::StampedJournalEntry& journalEntry) { return journalEntry.mInfoId.serializeText(); }); [](const MWDialogue::StampedJournalEntry& journalEntry) { return journalEntry.mInfoId.serializeText(); });
journalEntryBindingsClass["text"] = sol::readonly_property( journalEntryBindingsClass["text"] = sol::readonly_property(
[](const MWDialogue::StampedJournalEntry& journalEntry) { return journalEntry.mText; }); [](const MWDialogue::StampedJournalEntry& journalEntry) -> std::string_view { return journalEntry.mText; });
journalEntryBindingsClass["questId"] = sol::readonly_property( journalEntryBindingsClass["questId"] = sol::readonly_property(
[](const MWDialogue::StampedJournalEntry& journalEntry) { return journalEntry.mTopic.serializeText(); }); [](const MWDialogue::StampedJournalEntry& journalEntry) { return journalEntry.mTopic.serializeText(); });
journalEntryBindingsClass["day"] = sol::readonly_property( journalEntryBindingsClass["day"] = sol::readonly_property(

6
apps/openmw/mwlua/uibindings.cpp
View File

@ -164,7 +164,7 @@ namespace MWLua
else else
return LuaUtil::toLuaIndex(index); return LuaUtil::toLuaIndex(index);
}; };
layersTable["insertAfter"] = [context](std::string afterName, std::string_view name, const sol::object& opt) { layersTable["insertAfter"] = [context](std::string afterName, std::string name, const sol::object& opt) {
LuaUi::Layer::Options options; LuaUi::Layer::Options options;
options.mInteractive = LuaUtil::getValueOrDefault(LuaUtil::getFieldOrNil(opt, "interactive"), true); options.mInteractive = LuaUtil::getValueOrDefault(LuaUtil::getFieldOrNil(opt, "interactive"), true);
context.mLuaManager->addAction( context.mLuaManager->addAction(
@ -177,11 +177,11 @@ namespace MWLua
}, },
"Insert after UI layer"); "Insert after UI layer");
}; };
layersTable["insertBefore"] = [context](std::string beforeName, std::string_view name, const sol::object& opt) { layersTable["insertBefore"] = [context](std::string beforeName, std::string name, const sol::object& opt) {
LuaUi::Layer::Options options; LuaUi::Layer::Options options;
options.mInteractive = LuaUtil::getValueOrDefault(LuaUtil::getFieldOrNil(opt, "interactive"), true); options.mInteractive = LuaUtil::getValueOrDefault(LuaUtil::getFieldOrNil(opt, "interactive"), true);
context.mLuaManager->addAction( context.mLuaManager->addAction(
[=]() { [beforeName = std::move(beforeName), name = std::move(name), options]() {
size_t index = LuaUi::Layer::indexOf(beforeName); size_t index = LuaUi::Layer::indexOf(beforeName);
if (index == LuaUi::Layer::count()) if (index == LuaUi::Layer::count())
throw std::logic_error( throw std::logic_error(

2
apps/openmw/mwworld/projectilemanager.cpp
View File

@ -786,7 +786,7 @@ namespace MWWorld
state.mSounds.push_back(sound); state.mSounds.push_back(sound);
} }
mMagicBolts.push_back(state); mMagicBolts.push_back(std::move(state));
return true; return true;
} }