Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-05-06 19:01:21 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

Allow running soulgem instructions on all actors (#7943)

Browse source
This commit is contained in:
Alexei Kotov 2024-04-22 23:52:14 +03:00
parent 023c0f7a46
commit 1c1df996be
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -170,6 +170,7 @@
Bug #7899: Editor: Doors can't be unlocked Bug #7899: Editor: Doors can't be unlocked
Bug #7901: Editor: Teleport-related fields shouldn't be editable if a ref does not teleport Bug #7901: Editor: Teleport-related fields shouldn't be editable if a ref does not teleport
Bug #7908: Key bindings names in the settings menu are layout-specific Bug #7908: Key bindings names in the settings menu are layout-specific
Bug #7943: Using "addSoulGem" and "dropSoulGem" commands to creatures works only with "Weapon & Shield" flagged ones
Feature #2566: Handle NAM9 records for manual cell references Feature #2566: Handle NAM9 records for manual cell references
Feature #3537: Shader-based water ripples Feature #3537: Shader-based water ripples
Feature #5173: Support for NiFogProperty Feature #5173: Support for NiFogProperty

10
apps/openmw/mwscript/miscextensions.cpp
View file

@ -631,7 +631,7 @@ namespace MWScript
ESM::RefId gem = ESM::RefId::stringRefId(runtime.getStringLiteral(runtime[0].mInteger)); ESM::RefId gem = ESM::RefId::stringRefId(runtime.getStringLiteral(runtime[0].mInteger));
runtime.pop(); runtime.pop();
if (!ptr.getClass().hasInventoryStore(ptr)) if (!ptr.getClass().isActor())
return; return;
const MWWorld::ESMStore& store = *MWBase::Environment::get().getESMStore(); const MWWorld::ESMStore& store = *MWBase::Environment::get().getESMStore();
@ -664,10 +664,10 @@ namespace MWScript
for (unsigned int i = 0; i < arg0; ++i) for (unsigned int i = 0; i < arg0; ++i)
runtime.pop(); runtime.pop();
if (!ptr.getClass().hasInventoryStore(ptr)) if (!ptr.getClass().isActor())
return; return;
MWWorld::InventoryStore& store = ptr.getClass().getInventoryStore(ptr); MWWorld::ContainerStore& store = ptr.getClass().getContainerStore(ptr);
for (MWWorld::ContainerStoreIterator it = store.begin(); it != store.end(); ++it) for (MWWorld::ContainerStoreIterator it = store.begin(); it != store.end(); ++it)
{ {
if (it->getCellRef().getSoul() == soul) if (it->getCellRef().getSoul() == soul)
@ -780,10 +780,10 @@ namespace MWScript
ESM::RefId soul = ESM::RefId::stringRefId(runtime.getStringLiteral(runtime[0].mInteger)); ESM::RefId soul = ESM::RefId::stringRefId(runtime.getStringLiteral(runtime[0].mInteger));
runtime.pop(); runtime.pop();
if (!ptr.getClass().hasInventoryStore(ptr)) if (!ptr.getClass().isActor())
return; return;
MWWorld::InventoryStore& store = ptr.getClass().getInventoryStore(ptr); MWWorld::ContainerStore& store = ptr.getClass().getContainerStore(ptr);
for (MWWorld::ContainerStoreIterator iter(store.begin()); iter != store.end(); ++iter) for (MWWorld::ContainerStoreIterator iter(store.begin()); iter != store.end(); ++iter)
{ {