mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-17 10:21:11 +00:00
Code Issues Projects Releases Wiki Activity

Remove Open action fallback for Tribunal NPC companions

Browse Source
This commit is contained in:
Alexei Kotov 2024-02-08 12:15:57 +03:00
parent c5564323e4
commit 0178c5aaef
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/openmw/mwclass/npc.cpp
View File

@ -954,10 +954,6 @@ namespace MWClass
return std::make_unique<MWWorld::ActionTalk>(ptr); 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) if (inCombatWithActor)
return std::make_unique<MWWorld::FailedAction>("#{sActorInCombat}"); return std::make_unique<MWWorld::FailedAction>("#{sActorInCombat}");