krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1231 from Allofich/tooltips

Browse source 
Show names on combat actors when RMB GUI is active
This commit is contained in:
scrawl 2017-03-22 20:21:58 +01:00 committed by GitHub
commit 7075a3a99b
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;