mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-19 21:23:52 +00:00
Code Issues Releases Wiki Activity

Show names on combat actors when RMB GUI is active

Browse source 
Fixes (#3797)
This commit is contained in:
Allofich 2017-03-22 19:55:48 +09:00
parent c992cb6e82
commit 5282556ae0
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwclass/creature.cpp
View file

@ -546,7 +546,7 @@ namespace MWClass
bool Creature::hasToolTip(const MWWorld::ConstPtr& ptr) const bool Creature::hasToolTip(const MWWorld::ConstPtr& ptr) const
{ {
if (!ptr.getRefData().getCustomData()) if (!ptr.getRefData().getCustomData() || MWBase::Environment::get().getWindowManager()->isGuiMode())
return true; return true;
const CreatureCustomData& customData = ptr.getRefData().getCustomData()->asCreatureCustomData(); const CreatureCustomData& customData = ptr.getRefData().getCustomData()->asCreatureCustomData();

2
apps/openmw/mwclass/npc.cpp
View file

@ -1007,7 +1007,7 @@ namespace MWClass
bool Npc::hasToolTip(const MWWorld::ConstPtr& ptr) const bool Npc::hasToolTip(const MWWorld::ConstPtr& ptr) const
{ {
if (!ptr.getRefData().getCustomData()) if (!ptr.getRefData().getCustomData() || MWBase::Environment::get().getWindowManager()->isGuiMode())
return true; return true;
const NpcCustomData& customData = ptr.getRefData().getCustomData()->asNpcCustomData(); const NpcCustomData& customData = ptr.getRefData().getCustomData()->asNpcCustomData();

2
apps/openmw/mwworld/worldimp.cpp
View file

@ -1039,7 +1039,7 @@ namespace MWWorld
facedObject = getFacedObject(activationDistance, true); facedObject = getFacedObject(activationDistance, true);
if (!facedObject.isEmpty() && !facedObject.getClass().allowTelekinesis(facedObject) if (!facedObject.isEmpty() && !facedObject.getClass().allowTelekinesis(facedObject)
&& mDistanceToFacedObject > getMaxActivationDistance()) && mDistanceToFacedObject > getMaxActivationDistance() && !MWBase::Environment::get().getWindowManager()->isGuiMode())
return 0; return 0;
} }
return facedObject; return facedObject;