mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-16 17:29:55 +00:00
Code Issues Releases Wiki Activity

Include creatures

Browse source
This commit is contained in:
Evil Eye 2024-05-25 09:58:46 +02:00
parent cdfd305ac3
commit 11e8e1eeb5
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/openmw/mwworld/cellstore.cpp
View file

@ -264,9 +264,7 @@ namespace
} }
else if (state.mVersion <= ESM::MaxOldCreatureStatsFormatVersion) else if (state.mVersion <= ESM::MaxOldCreatureStatsFormatVersion)
{ {
if constexpr (std::is_same_v<T, ESM::Creature>) if constexpr (std::is_same_v<T, ESM::Creature> || std::is_same_v<T, ESM::NPC>)
MWWorld::convertStats(state.mCreatureStats);
else if constexpr (std::is_same_v<T, ESM::NPC>)
{ {
MWWorld::convertStats(state.mCreatureStats); MWWorld::convertStats(state.mCreatureStats);
MWWorld::convertEnchantmentSlots(state.mCreatureStats, state.mInventory); MWWorld::convertEnchantmentSlots(state.mCreatureStats, state.mInventory);
@ -274,7 +272,7 @@ namespace
} }
else if (state.mVersion <= ESM::MaxActiveSpellSlotIndexFormatVersion) else if (state.mVersion <= ESM::MaxActiveSpellSlotIndexFormatVersion)
{ {
if constexpr (std::is_same_v<T, ESM::NPC>) if constexpr (std::is_same_v<T, ESM::Creature> || std::is_same_v<T, ESM::NPC>)
MWWorld::convertEnchantmentSlots(state.mCreatureStats, state.mInventory); MWWorld::convertEnchantmentSlots(state.mCreatureStats, state.mInventory);
} }

2
apps/openmw/mwworld/magiceffects.cpp
View file

@ -243,7 +243,7 @@ namespace MWWorld
continue; continue;
if (activeSpell.mFlags & ESM::ActiveSpells::Flag_Equipment) if (activeSpell.mFlags & ESM::ActiveSpells::Flag_Equipment)
{ {
auto slotIndex = activeSpell.mItem.mIndex; std::int64_t slotIndex = activeSpell.mItem.mIndex;
auto slot = std::find_if(inventory.mEquipmentSlots.begin(), inventory.mEquipmentSlots.end(), auto slot = std::find_if(inventory.mEquipmentSlots.begin(), inventory.mEquipmentSlots.end(),
[=](const auto& entry) { return entry.second == slotIndex; }); [=](const auto& entry) { return entry.second == slotIndex; });
if (slot != inventory.mEquipmentSlots.end() && slot->first < inventory.mItems.size()) if (slot != inventory.mEquipmentSlots.end() && slot->first < inventory.mItems.size())