mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-30 19:45:40 +00:00
Code Issues Releases Wiki Activity

Merge branch 'clean' into 'master'

Browse source 
Appease some clang warnings

See merge request OpenMW/openmw!1794
This commit is contained in:
jvoisin 2022-04-24 11:34:29 +00:00
commit 3621b9a759
2 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwgui/mapwindow.cpp
View file

@ -530,12 +530,10 @@ namespace MWGui
markerTexture = "textures\\detect_enchantment_icon.dds";
}
int counter = 0;
for (const MWWorld::Ptr& ptr : markers)
{
const ESM::Position& worldPos = ptr.getRefData().getPosition();
MarkerUserData markerPos (mLocalMapRender);
++counter;
MyGUI::ImageBox* markerWidget = mLocalMap->createWidget<MyGUI::ImageBox>("ImageBox",
getMarkerCoordinates(worldPos.pos[0], worldPos.pos[1], markerPos, 8), MyGUI::Align::Default);
markerWidget->setDepth(Local_MarkerAboveFogLayer);

2
apps/openmw/mwgui/tooltips.cpp
View file

@ -160,13 +160,11 @@ namespace MWGui
// try to go 1 level up until there is a widget that has tooltip
// this is necessary because some skin elements are actually separate widgets
int i=0;
while (!focus->isUserString("ToolTipType"))
{
focus = focus->getParent();
if (!focus)
return;
++i;
}
std::string type = focus->getUserString("ToolTipType");