mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-03-16 16:20:53 +00:00
Remove Open action fallback for Tribunal NPC companions
This commit is contained in:
parent
c5564323e4
commit
0178c5aaef
@ -954,10 +954,6 @@ namespace MWClass
|
||||
return std::make_unique<MWWorld::ActionTalk>(ptr);
|
||||
}
|
||||
|
||||
// Tribunal and some mod companions oddly enough must use open action as fallback
|
||||
if (!getScript(ptr).empty() && ptr.getRefData().getLocals().getIntVar(getScript(ptr), "companion"))
|
||||
return std::make_unique<MWWorld::ActionOpen>(ptr);
|
||||
|
||||
if (inCombatWithActor)
|
||||
return std::make_unique<MWWorld::FailedAction>("#{sActorInCombat}");
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user