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

Merge branch 'disabilitybenefits' into 'master'

Browse source 
Allow disabling objects that have no placed instances (#4289)

Closes #4289

See merge request OpenMW/openmw!4498
This commit is contained in:
psi29a 2025-01-04 14:19:18 +00:00
commit c33aaa5487
2 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -7,6 +7,7 @@
Bug #4127: Weapon animation looks choppy
Bug #4204: Dead slaughterfish doesn't float to water surface after loading saved game
Bug #4207: RestoreHealth/Fatigue spells have a huge priority even if a success chance is near 0
Bug #4289: Script compilation fails if an NPC deleted in a content file is disabled
Bug #4382: Sound output device does not change when it should
Bug #4508: Can't stack enchantment buffs from different instances of the same self-cast generic magic apparel
Bug #4610: Casting a Bound Weapon spell cancels the casting animation by equipping the weapon prematurely

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

@ -254,7 +254,26 @@ namespace MWScript
public:
void execute(Interpreter::Runtime& runtime) override
{
MWWorld::Ptr ptr = R()(runtime);
MWWorld::Ptr ptr;
if (!R::implicit)
{
ESM::RefId name = ESM::RefId::stringRefId(runtime.getStringLiteral(runtime[0].mInteger));
runtime.pop();
ptr = MWBase::Environment::get().getWorld()->searchPtr(name, false);
// We don't normally want to let this go, but some mods insist on trying this
if (ptr.isEmpty())
{
const std::string error = "Failed to find an instance of object " + name.toDebugString();
runtime.getContext().report(error);
Log(Debug::Error) << error;
return;
}
}
else
{
ptr = R()(runtime);
}
MWBase::Environment::get().getWorld()->disable(ptr);
}
};