mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-15 18:39:51 +00:00
Code Issues Projects Releases Wiki Activity

Minor console selection improvements

Browse Source
This commit is contained in:
Glorf 2013-03-18 23:46:17 +01:00
parent a07c910d0b
commit f5bf7254a8
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
apps/openmw/mwgui/tooltips.cpp
View File

@ -83,15 +83,22 @@ void ToolTips::onFrame(float frameDuration)
if (mWindowManager->getWorldMouseOver() && (mWindowManager->getMode() == GM_Console)) if (mWindowManager->getWorldMouseOver() && (mWindowManager->getMode() == GM_Console))
{ {
MWWorld::Ptr object = MWBase::Environment::get().getWorld()->getFacedObject(); MWWorld::Ptr objectptr = MWBase::Environment::get().getWorld()->getFacedObject();
if (!object.isEmpty()) if (!objectptr.isEmpty())
{
const MWWorld::Class& objectclass = MWWorld::Class::get (mFocusObject);
IntSize tooltipSize;
if (!objectclass.hasToolTip(mFocusObject))
{ {
setCoord(0, 0, 300, 300); setCoord(0, 0, 300, 300);
mDynamicToolTipBox->setVisible(true); mDynamicToolTipBox->setVisible(true);
ToolTipInfo info; ToolTipInfo info;
info.caption=object.getCellRef().mRefID; info.caption=objectptr.getCellRef().mRefID;
info.icon=""; info.icon="";
IntSize tooltipSize = createToolTip(info); tooltipSize = createToolTip(info);
}
else
tooltipSize = getToolTipViaPtr(true);
IntPoint tooltipPosition = InputManager::getInstance().getMousePosition() + IntPoint(0, 24); IntPoint tooltipPosition = InputManager::getInstance().getMousePosition() + IntPoint(0, 24);
if ((tooltipPosition.left + tooltipSize.width) > viewSize.width) if ((tooltipPosition.left + tooltipSize.width) > viewSize.width)

6
apps/openmw/mwworld/worldimp.cpp
View File

@ -673,10 +673,10 @@ namespace MWWorld
MWWorld::Ptr object = searchPtrViaHandle (result.second); MWWorld::Ptr object = searchPtrViaHandle (result.second);
float ActivationDistance; float ActivationDistance;
if (object.getTypeName ().find("NPC") != std::string::npos) if (MWBase::Environment::get().getWindowManager()->isConsoleMode())
ActivationDistance = getNpcActivationDistance ();
else if (MWBase::Environment::get().getWindowManager()->isConsoleMode())
ActivationDistance = getObjectActivationDistance ()*50; ActivationDistance = getObjectActivationDistance ()*50;
else if (object.getTypeName ().find("NPC") != std::string::npos)
ActivationDistance = getNpcActivationDistance ();
else else
ActivationDistance = getObjectActivationDistance (); ActivationDistance = getObjectActivationDistance ();