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

Merge branch 'mudcrabcanhazsoulgem' into 'master'

Browse source 
Allow running soulgem instructions on all actors (#7943)

Closes #7943

See merge request OpenMW/openmw!4048
This commit is contained in:
psi29a 2024-04-24 13:20:09 +00:00
commit a20f456a5c
2 changed files with 6 additions and 5 deletions
Show stats 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 #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 #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 #3537: Shader-based water ripples
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));
runtime.pop();
if (!ptr.getClass().hasInventoryStore(ptr))
if (!ptr.getClass().isActor())
return;
const MWWorld::ESMStore& store = *MWBase::Environment::get().getESMStore();
@ -664,10 +664,10 @@ namespace MWScript
for (unsigned int i = 0; i < arg0; ++i)
runtime.pop();
if (!ptr.getClass().hasInventoryStore(ptr))
if (!ptr.getClass().isActor())
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)
{
if (it->getCellRef().getSoul() == soul)
@ -780,10 +780,10 @@ namespace MWScript
ESM::RefId soul = ESM::RefId::stringRefId(runtime.getStringLiteral(runtime[0].mInteger));
runtime.pop();
if (!ptr.getClass().hasInventoryStore(ptr))
if (!ptr.getClass().isActor())
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)
{