1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-05-11 22:41:26 +00:00

Merge branch 'getsoundplaying' into 'master'

Don't require a reference for GetSoundPlaying (#8389)

Closes #8389

See merge request OpenMW/openmw!4576
This commit is contained in:
psi29a 2025-03-10 08:13:23 +00:00
commit 73bb17009e

View file

@ -162,11 +162,17 @@ namespace MWScript
public: public:
void execute(Interpreter::Runtime& runtime) override void execute(Interpreter::Runtime& runtime) override
{ {
MWWorld::Ptr ptr = R()(runtime); MWWorld::Ptr ptr = R()(runtime, false);
int index = runtime[0].mInteger; int index = runtime[0].mInteger;
runtime.pop(); runtime.pop();
if (ptr.isEmpty())
{
runtime.push(0);
return;
}
bool ret = MWBase::Environment::get().getSoundManager()->getSoundPlaying( bool ret = MWBase::Environment::get().getSoundManager()->getSoundPlaying(
ptr, ESM::RefId::stringRefId(runtime.getStringLiteral(index))); ptr, ESM::RefId::stringRefId(runtime.getStringLiteral(index)));